diff --git a/.depend b/.depend index ba6a9d6b7efc..ac5fa84a4c7f 100644 --- a/.depend +++ b/.depend @@ -73,11 +73,12 @@ kex.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h kex.o: myproposal.h sshbuf.h canohost.h digest.h xmalloc.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/bsd-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/bsd-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/bsd-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 +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/bsd-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 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/bsd-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 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/bsd-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/bsd-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/bsd-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 +kexmlkem768ecdh.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/bsd-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 kexmlkem768x25519.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/bsd-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 log.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/bsd-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/bsd-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 sshkey.h misc.h log.h digest.h bitmap.h utf8.h krl.h @@ -139,7 +140,7 @@ sntrup761.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-com 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/bsd-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 servconf.h match.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/bsd-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/bsd-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 sshbuf.h sshkey.h authfd.h log.h ssherr.h misc.h digest.h match.h msg.h pathnames.h ssh-pkcs11.h sk-api.h myproposal.h version.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/bsd-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-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/bsd-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.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/bsd-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/bsd-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 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/bsd-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 diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh index 99ebe3943ad9..55233787da72 100755 --- a/.github/setup_ci.sh +++ b/.github/setup_ci.sh @@ -156,10 +156,6 @@ for TARGET in $TARGETS; do 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 diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 13b6cbd18795..41d933a92f11 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -107,7 +107,6 @@ jobs: - { target: ubuntu-latest, config: libressl-4.2.0 } - { target: ubuntu-latest, config: libressl-4.3.2 } - { target: ubuntu-latest, config: openssl-master } - - { target: ubuntu-latest, config: openssl-noec } - { target: ubuntu-latest, config: openssl-1.1.1 } - { target: ubuntu-latest, config: openssl-1.1.1t } - { target: ubuntu-latest, config: openssl-1.1.1w } diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml index d9f38472c405..02d768018c85 100644 --- a/.github/workflows/selfhosted.yml +++ b/.github/workflows/selfhosted.yml @@ -2,7 +2,7 @@ name: CI self-hosted on: push: - paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/run_tests.sh', '.github/workflows/selfhosted.yml' ] + paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac','regress/Makefile', '.github/configs', '.github/run_tests.sh', '.github/workflows/selfhosted.yml' ] jobs: selfhosted: @@ -52,6 +52,7 @@ jobs: - obsd76 - obsd77 - obsd78 + - obsd79 - obsdsnap - obsdsnap-i386 - omnios diff --git a/.github/workflows/vm.yml b/.github/workflows/vm.yml index 0235285714c6..8906557cd8c8 100644 --- a/.github/workflows/vm.yml +++ b/.github/workflows/vm.yml @@ -7,9 +7,9 @@ name: CI VM on: push: - paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/vm.yml' ] + paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', 'regress/Makefile', '.github/configs', '.github/workflows/vm.yml' ] pull_request: - paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/vm.yml' ] + paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', 'regress/Makefile', '.github/configs', '.github/workflows/vm.yml' ] jobs: dragonflybsd: diff --git a/.gitignore b/.gitignore index 657b59a22f8d..945eae918df3 100644 --- a/.gitignore +++ b/.gitignore @@ -56,4 +56,4 @@ hpnsshd-auth !regress/misc/**/Makefile !regress/unittests/**/Makefile tags -*.0 \ No newline at end of file +*.0 diff --git a/ChangeLog b/ChangeLog index 460be9395a8c..1b7db8f0dc38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,17650 +1,1972 @@ -commit 87abb9c7fbedf922be66bb50e1604a500bdee781 +commit 1267d412dd9322c0275c1ed135fa2b1da41944e9 Author: Chris Rapier -Date: Mon Mar 30 16:48:06 2026 -0400 +Date: Tue Sep 8 16:34:32 2026 -0400 - Had a tab instead of spaces in yaml file + Another attempt to deal with the windows issue. this time in setup_ci. + + Make sure that we are pulling the 3.6.10 release for everything. + +commit a09562482f4dade845a89e43ee14cd5bf9541eae +Author: Chris Rapier +Date: Tue Sep 8 15:48:25 2026 -0400 + + Issues with cygwin and hardend malloc in CI + + Both cygwin and graphene (hardened malloc source) recently released + new version. The hardened malloc requires we use clang 20 and specifically + allowing the MADV_DONRNEED_LOCKED allow. + + Cygwin is pulling in the dev version of 3.7 so we are pinning it to the + release version where it was working before. The dev version seems to have + an issue causing this to fail on the first connection attempt. + This will need to be changed once we get this to pass. + +commit 3c1221671ac7a324ca15e93736339457a3a3a281 +Author: Chris Rapier +Date: Tue Sep 8 11:00:41 2026 -0400 + + Crank version number to 18.10 + +commit 058f38858dc01c64f23233ceeb4716faf0b63d4e +Author: Chris Rapier +Date: Thu Sep 3 17:03:53 2026 -0400 + + Don't rely solely on pthread_cancel to stop AES-CTR-MT threads. + + Worker threads park in pthread_cond_wait() and, off of OSX, could only be + removed by pthread_cancel(). When that cancel isn't delivered the + following pthread_join() blocks forever and the session hangs at + teardown. Reproduced under valgrind, which wedged roughly half of + try-ciphers runs. + + The graceful exit path already existed for OSX, where cancels are also + unreliable, but was fenced off there. Enable it everywhere and broadcast + each queue's condition variable so parked threads wake, see the flag and + exit. pthread_cancel stays as a fallback. + +commit a430fc206ba44cbd628379074cd815277234c579 +Author: Chris Rapier +Date: Thu Sep 3 14:31:35 2026 -0400 -commit b3084abc7f7d808a066913274271e8dfde0e4230 + Make the valgrind PAM CI job actually test PAM. + + The valgrind-pam-1 job matched no branch in the inner case statement + that assigns test sets so it ran with both LTESTS and SKIP_LTESTS empty, + meaning the entire regress suite under valgrind. This ended up being consistently + longer than the allocated 6 hours so the tests would also get cancled and + never reach what we needed. + + Give valgrind-pam-1 its own test list covering authentication and + session setup, and drop the dangling valgrind-pam pattern. + + While here, remove a duplicated EPHEMERAL_VM password-setup in + setup_ci.sh. + +commit 8359bf405482bccdd56ad405e8aaf508a40e5e21 +Author: Chris Rapier +Date: Thu Sep 3 09:30:06 2026 -0400 + + Upstream CI tests were failing when run against OpenSSL without threads. + + This is not something we support so remove that requirement from + the CI tests. This is also noted in the installation documents. + +commit 56ef588fa9e88ee083ef7ffc770c6706a21f32ea Author: Chris Rapier -Date: Mon Mar 30 16:25:05 2026 -0400 +Date: Wed Sep 2 17:22:33 2026 -0400 - packet.c seems to be missing the channels.h header. + Fencepost error when freeing the batches and a memory leak. -commit f76ec2f554a766e64e5c32a13383dcdc45f71fbf -Merge: fad1f53cf 1340d3fa8 +commit 659ba165b58f18d881d5d7d15ba320a9de70c1c8 Author: Chris Rapier -Date: Mon Mar 30 16:16:04 2026 -0400 +Date: Wed Sep 2 15:57:37 2026 -0400 - Merging master as of 3/30/26 + Force a commit to trigger the github CI -commit fad1f53cfc383f514789750e720d496f2da3c22d -Merge: c3c0cc2d2 a717c404a +commit c695bafca86288932d52e0776a91c6cb625bc1da Author: Chris Rapier -Date: Mon Mar 30 12:20:48 2026 -0400 +Date: Tue Jul 7 09:46:56 2026 -0400 - Incorporating bug-restrict-window-openssh10 + Crank version to 18.9.1 -commit a717c404a0188108ffba7f99ba2db7e571a757eb +commit c7b947d9e2f5ab0673443b8b6aa433ce247a8dca +Merge: e2dfa0cea e39f9d87e Author: Chris Rapier -Date: Mon Mar 30 12:15:48 2026 -0400 +Date: Tue Jul 7 09:45:59 2026 -0400 - Minor change to CI + Update .depend -commit 1340d3fa8e4bb122906a82159c4c9b91584d65ce +commit e39f9d87e339b40081d877ace7439d4166be7c2d Author: Darren Tucker -Date: Mon Mar 30 21:58:44 2026 +1100 +Date: Mon Jul 6 21:14:53 2026 +1000 - Add proxyjump.sh omitted from previous commit. + Add 10.4 branch to status page. -commit 607bd871ec029e9aa22e632a22547250f3cae223 -Author: djm@openbsd.org -Date: Mon Mar 30 07:19:02 2026 +0000 +commit 449d25b4f8b8d3bb55a865ebcbec17b39b37c208 +Author: Damien Miller +Date: Mon Jul 6 17:56:53 2026 +1000 - upstream: add a regression test for ProxyJump/-J; ok dtucker - - OpenBSD-Regress-ID: 400dc1b5fb7f2437d0dfbd2eb9a3583dafb412b3 + depend -commit 55fc7bfd1d3a46f4856fd68f09da60d901fac626 -Author: dtucker@openbsd.org -Date: Tue Mar 24 12:31:35 2026 +0000 +commit 0227fe4606ebf86b3f6f9b80af12e171eaa58416 +Author: Damien Miller +Date: Mon Jul 6 17:56:10 2026 +1000 - upstream: Use ~/.shosts for Hostbased test. - - OpenBSD-Regress-ID: ab64fd0a86422df1eadacde56c0a2cff5d93425d + crank version numbers -commit 445db5cb620d73c9af1f1791c523aaf3d2236854 -Author: dtucker@openbsd.org -Date: Tue Mar 24 10:21:14 2026 +0000 +commit 0210c7cc942ee54bd6a647d5732df9786c4b08d0 +Author: djm@openbsd.org +Date: Mon Jul 6 07:54:26 2026 +0000 - upstream: Ensure known_hosts file exists when setting up. + upstream: openssh-10.4 - OpenBSD-Regress-ID: 92721cad4c219fe62b7b795a73505c22e56f09e0 + OpenBSD-Commit-ID: ce7b0749e5139c70410ee92a13d368d7d34262b5 -commit 2ecfcc0aae651621535e345a1c23ff6d2a9593c9 -Author: dtucker@openbsd.org -Date: Mon Mar 23 09:53:52 2026 +0000 +commit 5d04ca6af739b82fd30d84d2783ca802ebfa1192 +Author: djm@openbsd.org +Date: Mon Jul 6 07:53:30 2026 +0000 - upstream: Check if host keys exist before adding them, and expand + upstream: Fix multiple RFC 4462 (GSSAPIAuthentication) compliance - on the warning about modifying the system config. + problems - OpenBSD-Regress-ID: 68038da909f9c992375b7665dab0331d6af426b7 - -commit 5576e260a0f9836ca55c8279e342c63d1a0851d1 -Author: dtucker@openbsd.org -Date: Mon Mar 23 09:09:36 2026 +0000 - - upstream: Add special handling of + 1) Remove an early failure return for GSSAPI authentication attempts + made for invalid accounts that yielded different behaviour for + valid vs invalid accounts. + + 2) Fix a situation where some GSSAPI requestes were not correctly + subjected to MaxAuthTries. - TEST_SSH_HOSTBASED_AUTH=setupandrun. + 3) Fix a moderate pre-authentication resource DoS related to #2. - This will MODIFY THE CONFIG OF THE SYSTEM IT IS RUNNING ON to enable - hostbased authentication to/from itself and run the hostbased tests. It - won't undo these changes, so don't do this on a system where this matters. + Add missing logging for error cases. - OpenBSD-Regress-ID: ae5a86db1791a2b8f999b07b5c8cc756d40bf645 + Report and fixes from Manfred Kaiser, milCERT AT + + OpenBSD-Commit-ID: ca0acdd64eea435d6f89534538a9eb404a5629d3 -commit 0a0ef4515361143cad21afa072319823854c1cf6 +commit e8bdfb151a356d0171fea4194dd205fbb252be23 Author: djm@openbsd.org -Date: Mon Mar 30 07:18:24 2026 +0000 +Date: Mon Jul 6 07:49:58 2026 +0000 - upstream: apply the same validity rules to usernames and hostnames + upstream: fix ownership and lifetime of several bits of client + + state that need to persist for the life of the connection, especially the + cached hostkey that was being incorrectly freed early on some paths, possibly + allowing its use after free. - set for ProxyJump/-J on the commandline as we do for destination user/host - names. + Reported by Zhenpeng (Leo) Lin from depthfirst.com - Specifically, they are no longer allowed to contain most characters - that have special meaning for common shells. Special characters are - still allowed in ProxyJump commands that are specified in the config - files. + OpenBSD-Commit-ID: faaa6ad72e7d69d41fa8b197b606265b7d9bc73f + +commit d43ba60c91cb323ca921049b7d43b1908c318454 +Author: djm@openbsd.org +Date: Mon Jul 6 07:44:48 2026 +0000 + + upstream: Fix cases in GSSAPI and keyboard-interactive - This _reduces_ the chance that shell characters from a hostile -J - option from ending up in a shell execution context. + authentication where the minimum per-attempt delay was not being enforced. - Don't pass untrusted stuff to the ssh commandline, it's not intended - to be a security boundary. We try to make it safe where we can, but - we can't make guarantees, because we can't know the parsing rules - and special characters for all the shells in the world, nor can we - know what the user does with this data in their ssh_config wrt - percent expansion, LocalCommand, match exec, etc. + Reported by Orange Cyberdefense Vulnerability Team - While I'm in there, make ProxyJump and ProxyCommand first-match-wins - between each other. + OpenBSD-Commit-ID: c40bd35cc2428fcaccad7a141703c28baa6da01e + +commit cf67d46cba77d493152830a108b5f294ee9c5140 +Author: dtucker@openbsd.org +Date: Sun Jul 5 02:46:44 2026 +0000 + + upstream: void functions should not return anything. Patch from Tim - reported by rabbit; ok dtucker@ + Rice. - OpenBSD-Commit-ID: f05ad8a1eb5f6735f9a935a71a90580226759263 + OpenBSD-Commit-ID: bb5021b2b45d9d3f54a012d569872805d107f59c -commit b62a6cfbed3481dac8bff35fab22cf489bb0b77f +commit 93d6348ae44491b7542d78c0d55da7130e9db017 Author: djm@openbsd.org -Date: Sun Mar 29 01:08:13 2026 +0000 +Date: Sun Jul 5 00:16:21 2026 +0000 - upstream: switch from int to long long for bandwidth calculations; + upstream: fix inverted test that broke ssh-add with keys on stdin. From - fixes rate display when rate > 2GB/s; based on patch from Cyril Servant - feedback/ok deraadt@ + Laurence Tratt - OpenBSD-Commit-ID: 071eb48c4cba598d70ea3854bef7c49ddfabf8d3 + OpenBSD-Commit-ID: bcef522cfa587c7cf035660bb347cff36b65bfbd -commit 54443b8665c9c29ea0e3f5a5176d8f3c3403ad7c +commit aab5620a66777afbe9e0939b4961e5751d6e7938 Author: Damien Miller -Date: Sun Mar 29 16:43:59 2026 +1100 +Date: Fri Jul 3 14:20:02 2026 +1000 - depend + grammar fix; from Daniel O'Connor -commit c90f46b6230826cdadacd6c32b62b0f8106a09da +commit c123ac1c579212c08c17d927cb8e379d45f9fccb Author: Damien Miller -Date: Sun Mar 29 16:42:33 2026 +1100 +Date: Fri Jul 3 14:16:29 2026 +1000 - use nonnull attribute when available - - Set this attribute on a few string to avoid compiler warnings from - -Wunterminated-string-initialization warnings in recent gcc. + more config option details in README.privsep -commit bdaf65ae51d62c6cb676bd341cc34217c1b24920 +commit 3912be7baa05819c382ce0e5d0ef847c9d80f230 Author: Damien Miller -Date: Sun Mar 29 16:24:59 2026 +1100 +Date: Fri Jul 3 14:10:16 2026 +1000 - fix state confusion between PAM and privsep code - - Commits b9a6dd4d6 and df2b28163 introduced a potential desynchronisation - between the PAM code and the sshd-session monitor that could result in - authentication bypass if the unprivileged sshd-auth process had been - compromised. - - Reported by Ben Edelman of NIST. Only git HEAD is affected, these - changes have not yet been included in an OpenSSH release. + more README.privsep polish -commit 6eb5a68c42a587df802d3d9a19088671269ffca8 -Author: Laurent Chardon -Date: Sat Mar 28 04:22:54 2026 -0400 +commit f80e6545ee9eb60b3fb8b0097fcc12aad47a54b4 +Author: Damien Miller +Date: Fri Jul 3 13:33:16 2026 +1000 - openbsd-compat: reword EAI_NONAME error string - - Reword the EAI_NONAME message in fake-rfc2553.c to make it - clearer and grammatically correct. - - While there, remove a couple of stray periods from other error - strings to keep the messages consistent. - - No functional change. + tweak; from dlg@ + +commit 01ed1c648a2c42e85e73cac3b7647f1cddc4abba +Author: Damien Miller +Date: Fri Jul 3 12:49:26 2026 +1000 -commit fd7d4b2b52deaf296b06d78b85c97fdae31912e8 -Author: Icenowy Zheng -Date: Sun Mar 22 15:13:31 2026 +0800 + tweak previous - seccomp sandbox: allow riscv_hwprobe syscall if present - - The development branch of zlib-ng now contains code for utilizing - riscv_hwprobe syscall to retrieve availability information for several - RISC-V extensions (and accelerate deflate algorithm with them). +commit 85dcff277e7a5299ec13af12517aefb123b1aa95 +Author: Damien Miller +Date: Fri Jul 3 12:31:27 2026 +1000 + + revise README.privsep for multi-binary model - As the seccomp sandbox of OpenSSH will raise SIGSYS for filtered out - syscalls, this will abruptly terminate the process when the - riscv_hwprobe syscall is tried. + This rewrites most of the privsep description to more accurately capture + recent changes in how sshd managed privilege across its lifecycle, + including describing the roles of the sshd-session and sshd-auth + helper binaries. - Put it into the allowlist to prevent process termination. As all - syscalls here are guarded by #ifdef's, the same will be done for - riscv_hwprobe, and thus on non-RISC-V builds nothing will happen. + Also 100% more ASCII art + +commit a5ecfdc21864b29ef9a939b9cfe7a2a8ffcdf439 +Author: Darren Tucker +Date: Thu Jul 2 10:05:43 2026 +1000 + + Need clang >= 19 for constexpr in hardened_malloc. + +commit c53864fc40045d0413c36a19ca784b1b2f985dd9 +Author: Darren Tucker +Date: Thu Jun 25 18:43:48 2026 +1000 + + Tabs -> spaces. + +commit 0a75a95d582028c5ce91f524c20365df9f2515f2 +Author: Zoltan Fridrich +Date: Wed Apr 16 15:11:59 2025 +0200 + + Provide better error for non-supported private keys - Signed-off-by: Icenowy Zheng + Signed-off-by: Zoltan Fridrich -commit fd5018fbeb6e91ae4321490c2825ecc632b83748 +commit 654e1a3e5b58029b05f1df0308e7e4d4407b37c2 Author: djm@openbsd.org -Date: Sat Mar 28 05:16:18 2026 +0000 +Date: Wed Jul 1 01:14:39 2026 +0000 - upstream: ensure c->local_window doesn't underflow during updates; + upstream: more missing mldsa44-ed25519, based on GHPR696 from Loganaden - similar to checks performed elsewhere. From Renaud Allard + Velvindron - OpenBSD-Commit-ID: 4827c10807936e9ab9af2cf1c7379e1f56dbdeac + OpenBSD-Commit-ID: f32e17df54fa66b0e936f1aeb3963f949e4a9bb8 -commit 8331cb9daafd23391de4379e9977ff159bb8242e +commit 088ca00b8f19a0257b2f869cb828ab75e99ab3a1 Author: djm@openbsd.org -Date: Sat Mar 28 05:10:25 2026 +0000 +Date: Wed Jul 1 01:08:51 2026 +0000 - upstream: fix base16 parsing; currently unused. From Renaud Allard + upstream: whitespace - OpenBSD-Commit-ID: 3f6e5d4c6a2550d5a7e3c33bcd895b7f8e42196b + OpenBSD-Commit-ID: 730e54174b2182c7011cc87a0fdae595cd9bcc2d -commit 21ecb5fd72ee442a8b1eb5011c7f929ba8ce02f9 +commit 0cdead097bde10712cd0635b5d350c16e07ba52a Author: djm@openbsd.org -Date: Sat Mar 28 05:07:12 2026 +0000 +Date: Wed Jul 1 01:06:54 2026 +0000 - upstream: mention that RevokedKeys is read by the server at each + upstream: simplify SIGINFO output: remove list of active channels (too - authentication time and should only ever be replaced atomically. + verbose) and just display destination and connection duration; requested + deraadt@ - OpenBSD-Commit-ID: eeedf5a10331ac4e39fbd2fc41e4a11c38b2ef9b + OpenBSD-Commit-ID: cb36192cd53483f8e452ea91bc42be7bbb2fffa3 -commit c5182e3f06f9f1fd86d62b9dcd0397408dd698da +commit 55ffd11b88f073662cdf0c8c48fe0800b8a71fc4 Author: djm@openbsd.org -Date: Sat Mar 28 05:06:16 2026 +0000 +Date: Wed Jul 1 00:52:31 2026 +0000 - upstream: fix potential hang if /etc/moduli doesn't contain the + upstream: Tighten up the introduction a little: - requested DH group values; from 77c9ca, ok dtucker@, markus@ + Mention Match as a conditional directive (previously it only + mentioned Host) - OpenBSD-Commit-ID: 1bf402cdb8876237c280ac77fbf7fafd2c16c5ae - -commit d3efbba14fda78ed7b15fbc34cf34c1cf27d1716 -Author: Darren Tucker -Date: Thu Mar 19 17:57:26 2026 +1100 - - Add a VM-based test for OpenBSD-current. + Try to use consistent language in the introduction to refer to + configuration directives (previously it used "parameters" and + "keywords" interchangeably). + + Mention that comments may appear at the end of the line too, and that + whitespace at the beginning/end of lines is not significant. + + OpenBSD-Commit-ID: e08f34413eeced47478c14d5005726f9bdd5d80e -commit 4bb4f1601e0776e71cfca50aae3680eb0771e2d0 -Author: Darren Tucker -Date: Mon Mar 23 17:50:40 2026 +1100 +commit 8b05bbeb293c5f777915e37e9ed43a06fb8e7614 +Author: dtucker@openbsd.org +Date: Wed Jul 1 00:52:23 2026 +0000 - Add a Valgrind test of the PAM config. + upstream: Move negative-FD checks to before first use. CID 909998, + + ok djm@ + + OpenBSD-Commit-ID: f0208911d27fd5bd66cd608c7b6fb5a36002d6a5 -commit 12da685dfc98b14dddb5977a1fc52d06474f3308 -Author: Darren Tucker -Date: Thu Mar 19 17:52:54 2026 +1100 +commit 296393226e4849010516150f3e19dbfc68789503 +Author: djm@openbsd.org +Date: Wed Jul 1 00:04:46 2026 +0000 - Upstream tests don't use the config file. + upstream: ssh -o doesn't support Host or Include options, they are only + + valid in the config file. bz3968 from xspielinbox + + OpenBSD-Commit-ID: cbecf11f2eea63e3cf6752e9bbe59091ba60cd32 -commit 415df68b1cf09a0b80215a809cf091b3d6ad3aa3 -Author: Chris Rapier -Date: Tue Mar 24 15:01:28 2026 -0400 +commit fe85df40aed36a49b9883186a123a1435c17f895 +Author: djm@openbsd.org +Date: Tue Jun 30 23:55:32 2026 +0000 - Section off call to EVP_CIPHER_meth_free() in cipher.c + upstream: mention mldsa44-ed25519 in usage(); based on GHPR695 from - OpenSSL 4 has removed the API for EVP_CIPHER_meth*. It was - deprecated in OpenSSL3 but it's gone now. Wrap the call around - an 'if !defined(WITH_OPENSSL3)' and it won't get triggered - except on OpenSSL 1.1. + Loganaden Velvindron + + OpenBSD-Commit-ID: 4af2400312b6ca232a68a758160ca5c64ca6a168 -commit 9b5bfb751908cfdfb7f70eb7e92264e185ee6876 -Author: Chris Rapier -Date: Tue Mar 24 12:17:27 2026 -0400 +commit aabe6d25498d9dc69fa21fbb14352fd4b3d5e9fa +Author: tb@openbsd.org +Date: Tue Jun 30 03:42:53 2026 +0000 - Increment subversion number. + upstream: ssherr-libcrypto: avoid use of deprecated + + ERR_load_crypto_strings() + + Follow regress and use unchecked OPENSSL_init_crypto() because + ERR_load_crypto_strings() has been deprecated in OpenSSL 1.1.0. + This call can in principle fail, in which case there's a fallback + to generic error strings. + + There is still use of OpenSSL 3.x-deprecated API in here. That's + a problem for someone else to solve. + + ok djm + + OpenBSD-Commit-ID: 3e9dc94caa83b361775b83a92425e858f8680c05 -commit 1b9478cedc9e7b47287e7dc164a23c831f28b941 -Author: Chris Rapier -Date: Tue Mar 24 12:11:13 2026 -0400 +commit dcba967d3f39f89d17634e550e1741b2b91f4c5c +Author: djm@openbsd.org +Date: Tue Jun 30 02:30:19 2026 +0000 - Minor additions to make clean. + upstream: another ruser_name/ruser_group vs attrib_to_stat() ordering + + screwup. Coverity CID 910530 via dtucker@ - While not associated with the compat.c fixes this - removes some more files in /regress when cleaning. + OpenBSD-Commit-ID: d8c4656119f09304e79fcf2ab32299ed68006a29 -commit 732779be795da930624c366583f257d94920fa80 -Author: Chris Rapier -Date: Tue Mar 24 11:35:22 2026 -0400 +commit 710cd5abcea22aeddbd5d5d661c224eaa05e47b9 +Author: djm@openbsd.org +Date: Tue Jun 30 00:10:48 2026 +0000 - Update version matching in compat.c + upstream: set FD_CLOEXEC on the fds between sftp and its ssh - The old version uses a clunky set of strstrs to determine if the remote - was hpnssh and if they are using hpn-prefixed binaries. It was also - checking to see if it was openssh and had strict window checking. This - replaces both methods using sscanf() to get the version numbers which means - we shouldn't have to touch this section of code for future versions. + process, avoids risk of subcommands that write on odd fds breaking the + connection. GHPR693 from Manuel Einfalt; feedback deraadt@ ok dtucker@ + + OpenBSD-Commit-ID: 91b12cd66580dab6b3bfe5e507a1a8310c8f9149 -commit 2ca6eef69d7dbecfd67cede25ea6a9aa1074ba3e +commit fa447bd5836f6d1c742c543207a3a6ec2909da75 Author: djm@openbsd.org -Date: Mon Mar 23 01:33:46 2026 +0000 +Date: Tue Jun 30 00:09:01 2026 +0000 - upstream: clarify that Authorized(Keys|Principals)(File|Command) - - are only consulted for valid users. + upstream: check key and IV length received in privsep state - clarify that TOKENS are expanded without sanitisation or escaping - and that it's the user's reponsibility to ensure their usage is - safe. + transfer exactly match the expected sizes for the selected cipher; partially + redundant to similar checks in cipher_init(), but nice to be more exact. - prompted by bz3936; feedback/ok deraadt@ + GHPR from jmestwa-coder; ok dtucker@ - OpenBSD-Commit-ID: cd58abad1137346ba2dee55fa9ebb975f5fa7a06 + OpenBSD-Commit-ID: d4a9deef194cc44189e835ac59b7b800b9b5c281 -commit 443616ce9070d370c97271347e91fcfd24b5df84 +commit 23a7c4d1284694f9973ebdae7884cd25d33e5cf8 Author: djm@openbsd.org -Date: Thu Mar 19 02:36:28 2026 +0000 +Date: Mon Jun 29 23:00:00 2026 +0000 - upstream: repair ssh-keysign after pledge changes; spotted/tested + upstream: revert bits that weren't ready for commit yet - by naddy@ ok deraadt@ - - OpenBSD-Commit-ID: fccc6c7994c8f45c4417efe490d23154d9caaa6d + OpenBSD-Commit-ID: ee8a219f02db32778444356ad2d93b983a38a704 -commit c3c0cc2d202c836d1196f626534660c0ea1fbfea -Merge: 803e55602 552a5c786 -Author: Chris Rapier -Date: Thu Mar 19 10:39:04 2026 -0400 +commit b9d2162e4a919168bbd983fa68663f813b534034 +Author: djm@openbsd.org +Date: Mon Jun 29 22:56:44 2026 +0000 - Merge to openssh master March 19, 2026 + upstream: Move user/group name lookup to correct place; coverity + + CID 910530 via dtucker@ + + OpenBSD-Commit-ID: 03ba9f8c720eea38436e4fef4c40814eae1b1fe3 -commit 552a5c786b60a9cfe0d2c157dd18f78950529513 -Author: dtucker@openbsd.org -Date: Wed Mar 11 09:10:59 2026 +0000 +commit 0875a78bb7228986c2e89ef2f5fe041d2ab27ed7 +Author: djm@openbsd.org +Date: Mon Jun 29 09:14:25 2026 +0000 - upstream: Check return values of fcntl(... O_CLOEXEC) + upstream: fix ineffective max file size check when loading - calls by reusing the macro in monitor.c. Flagged by Coverity CID - 901297 in ssh-sk-client.c, a few other instances added for good measure. - begrudging ok deraadt@ + blobs/keys from files and add another one on a patch that was not covered by + the existing ones. From Tess Gauthier via bz3969 and bz3970 - OpenBSD-Commit-ID: b9de92e17ac0b04348770e5a25cb15a02b416926 + OpenBSD-Commit-ID: c0dec6c587853349113df85b6dc528dc15079af0 -commit 24168275e6d0b29cf2233c3f2c1d4a4614feb582 -Author: dtucker@openbsd.org -Date: Wed Mar 11 09:04:17 2026 +0000 +commit 5d8e42933ab3f1a1c17608c32d680300f5524a99 +Author: djm@openbsd.org +Date: Mon Jun 29 08:59:31 2026 +0000 - upstream: Fix potential 1-byte array overrun + upstream: check strdup() return to avoid NULL deref on failure. - in the case where read() returns exactly 100 bytes. Flagged by Coverity - CID 901296, ok djm@ + bz3948 from RuiHe-MO - OpenBSD-Commit-ID: 66a96b08166e63dcbeed00297c33f09c4f22c1f7 + OpenBSD-Commit-ID: 2b1fbfb2e1f3359150feadfdf05acaa1c7d211e8 -commit 70a41262839a2d65ca8ef9e8ea34ad471c52afa1 +commit 0eaeddeefa4bd9b1241788b27ed2967ab596c759 Author: djm@openbsd.org -Date: Tue Mar 10 07:27:14 2026 +0000 +Date: Mon Jun 29 08:57:06 2026 +0000 - upstream: whitespace + upstream: s/calloc/xcalloc/ to reduce noise from AI bug detectors - OpenBSD-Commit-ID: b16d2b4a96406538fa181053926cba44abca7f29 + that don't understand context + + OpenBSD-Commit-ID: dcef5b1804620f2aed108267bbf5023a81230e14 -commit ef98b6014bc3268e904092894ffcb63022172a97 -Author: deraadt@openbsd.org -Date: Tue Mar 10 06:35:29 2026 +0000 +commit a9cb2e30d3a50ba6a24047d87cd80e4b4a18b5ff +Author: djm@openbsd.org +Date: Mon Jun 29 08:48:22 2026 +0000 - upstream: when unveils error our, use correct variable + upstream: fix "ls -n", which was still displaying user/group names + + rather than numeric uids/gids. Based on patch from Tamilan in bz3953 - OpenBSD-Commit-ID: 6b496c10965e70413a9916a8823839c553c6b2c4 + OpenBSD-Commit-ID: 65dd2ecb870b727e872cf9df544f8767426d2cc0 -commit beba5884dfe8cc30aadef439af5e5d784b5788b1 -Author: deraadt@openbsd.org -Date: Tue Mar 10 03:45:01 2026 +0000 +commit 3c3226f79cf4fa1c0436a91768760b92df87ffab +Author: djm@openbsd.org +Date: Mon Jun 29 08:21:50 2026 +0000 - upstream: When execve() failure is indicated on the pipe, replicate + upstream: move documentation of the Include directive to near the - the same error conditions as the previous access() check did ok djm + start of the options list, alongside that for Match and Host which are + similar insofar as they all affect configuration parsing rather than altering + the configuration directly. from xspielinbox via bz3968 - OpenBSD-Commit-ID: 875a77dddf0809a3501de2b913cb3bfd4b64f3f7 + OpenBSD-Commit-ID: 1cde8af8d40dbbe3ea49cf56c5d408946c875230 -commit 2a9e1aadaa20a05430bddc30853fbd3449083a4d +commit ce697f1eaf76a3d8d700894726c7a826af393ed5 Author: djm@openbsd.org -Date: Tue Mar 10 03:40:26 2026 +0000 +Date: Mon Jun 29 08:19:21 2026 +0000 - upstream: unveil ssh-pkcs11-helper too; fixes breakage spotted by + upstream: mention RefuseConnection, VersionAddendum and - anton@ + WarnWeakCrypto along with other options. from xspielinbox via bz3968 - If SK/P11/askpass is overridden by environment, only unveil the requested - path and not both the requested one and the default. + OpenBSD-Commit-ID: 5d4ef72dc703a74e64175e4611961ea338379d66 + +commit 849748c6e5d79274020489b03d068361d98ff42f +Author: djm@openbsd.org +Date: Mon Jun 29 08:16:46 2026 +0000 + + upstream: correct directive name (s/Host/Match) in error message - feedback/ok deraadt@ + from xspielinbox via bz3968 - OpenBSD-Commit-ID: 84356c6a44f35e66fe73fc1524a7c8e908521eb2 + OpenBSD-Commit-ID: 3aec5cc9d349bcef12abc951490474f1217b4aeb -commit 46eb7dc5a6f312f99437ebdcf04f0f2c03aa570b -Author: deraadt@openbsd.org -Date: Sat Mar 7 18:35:43 2026 +0000 +commit c8716138281d3dac33c2c7e98615c52d2b606d85 +Author: djm@openbsd.org +Date: Mon Jun 29 07:56:19 2026 +0000 - upstream: With it's own daemonization / fd cleaning code, ssh-agent + upstream: report errors in fill_default_options() properly, based on - opens /dev/null O_RDWR after a pledge without "wpath". This is allowed in - current pledge because "/dev/null" is implicitly allowed to be opened even - with the most restrictive pledges or unveils. This is a design decision in - pledge made at the very beginning, to satisfy libc requirements. We've - finally had enough experience and know how to fix that in the near-future, - but need to review and fix all code which opens these implicit paths. The fix - is to add "wpath", so that "/dev/null" can be opened O_RDWR. But that is - uncomfortable, so we add unveil() allowing "/" with "r", 4 unveil "x" for the - potential askpass and helpers to be execve'd, and "/dev/null" with "wr". As - a result filesystem access is substantially more restricted than before, and - ssh-agent is ready for the future pledge change. ok djm dtucker + GHPR649 by Zoltán Fridrich + MIME-Version: 1.0 + Content-Type: text/plain; charset=UTF-8 + Content-Transfer-Encoding: 8bit - OpenBSD-Commit-ID: f223b11d2db3c0b14e53c1de59966dd5f372a977 + OpenBSD-Commit-ID: 10137e31df74c3100e3abc7d008b1645ca5b45af -commit b75bf339eae6115c544bdcefa0d67a6dcc971ec5 -Author: deraadt@openbsd.org -Date: Sat Mar 7 18:27:52 2026 +0000 +commit d9df26d7e93f76bc5b1c0cbd31cde0af00ccbbc0 +Author: djm@openbsd.org +Date: Mon Jun 29 07:46:22 2026 +0000 - upstream: Stop doing access() before execve(). It is a TOCTOU, but + upstream: don't use deprecated ERR_load_crypto_strings() - also it forces use of unveil "rx" instead of "x". This is done by using a - pipe() through the fork+execve attempt to expose execve failure and create - the same error return as the access() used to do. ok djm dtucker + GHPR650 from Mike Frysinger - OpenBSD-Commit-ID: f9ee96e20352f35dc6f39127e0cc6b804700200a + OpenBSD-Regress-ID: bfe86d9be1db4569c091f3d763cba04ddbb86ec0 -commit 73888af650f0ce27cd93797f3e351b2d1b670550 +commit 365522938f7a44df993c38f8a51836bab3628211 Author: Damien Miller -Date: Tue Mar 10 14:43:30 2026 +1100 +Date: Mon Jun 29 17:21:01 2026 +1000 - stubs for OpenBSD unveil(2) + don't leak rrset on fail; GHPR681 from metsw24-max + + ok dtucker -commit 4e15f7fc0c0ba897c227350eee1462d635ab32a6 -Author: dtucker@openbsd.org -Date: Fri Mar 6 07:06:45 2026 +0000 +commit fceb78d14abc710f2bab31f28d321a9bb2476781 +Author: Damien Miller +Date: Mon Jun 29 17:18:58 2026 +1000 - upstream: Move OpenBSD CVS ID marker to top of file to avoid conflicts + check sockaddr length; GHPR681 from metsw24-max - when syncing changes to portable. + ok dtucker + +commit 9d5238f44dda8d9455c085f51f2fb00774f69d38 +Author: Damien Miller +Date: Mon Jun 29 17:17:28 2026 +1000 + + return result of raise(2); GHPR681 from metsw24-max - OpenBSD-Regress-ID: 6b7a9ef354e13e26ed474e98d04ec1d74e56e54e + ok dtucker -commit 2df416dff1a1d5fb31598b7ce8fb5cb6b0f64fd3 -Author: dtucker@openbsd.org -Date: Fri Mar 6 06:57:33 2026 +0000 +commit fa5416dec1232dc67d979d28942344cdc8086ae6 +Author: Damien Miller +Date: Mon Jun 29 17:16:55 2026 +1000 - upstream: Replace u_intXX_t types with the equivalent C99 uintXX_t + use size_t for lengths; GHPR681 from metsw24-max - types to match similar change to the main ssh code. + ok dtucker + +commit ef6bef31de60b077cb7da954b202d65156fd510e +Author: Damien Miller +Date: Mon Jun 29 17:15:10 2026 +1000 + + fix leak of error path; GHPR681 from metsw24-max - OpenBSD-Regress-ID: a62b6499f784f75a4fcb865aebb83f5936917a91 + ok dtucker -commit e067ccd6b4306ca6422d94ff7ddd231cbddd43cb +commit 84365594f44423b69392f295f82e9cbcdd8c2640 Author: djm@openbsd.org -Date: Thu Mar 5 05:44:15 2026 +0000 +Date: Mon Jun 29 07:36:37 2026 +0000 - upstream: ssh-agent supports a "query" extension that allows a + upstream: don't print an error message when trying to load a host - client to request a list of extensions it support. This makes this capability - available to ssh-add via the -Q flag. - - ok markus@ + private key when PKCS#11 keys are in use, as these don't need the private + half on the filesystem. GHPR664 from Ingo Franzki - OpenBSD-Commit-ID: f211630568ff1a7d6bb4983a94f05ddac1c2d4eb + OpenBSD-Commit-ID: c93352e218cb1b74af04e8dc3a42eddec1f312c0 -commit 4fe278629c3f792628ea71132ba4fcbb9ceaa6b7 +commit d6a589d3c8530375c2d56bcfb914575a7fcd3715 Author: djm@openbsd.org -Date: Thu Mar 5 05:40:35 2026 +0000 +Date: Mon Jun 29 02:13:05 2026 +0000 - upstream: With IANA codepoints for draft-ietf-sshm-ssh-agent now + upstream: make ssh-add open it's connection to the agent after it - allocated, it's safe to start using the standard names for requesting agent - forwarding over the @openssh.com extension names we've used to date. + has finished getopt() processing and not before. This allows the -v flag to + work properly. - Support for the standard names is advertised via EXT_INFO. When the - client sees such support it will use the new names preferentially, - but the existing names remain supported unconditionally. + ok jca@ - ok markus@ - - OpenBSD-Commit-ID: 1ab4a0b4de01e81a432875c2b7e5f7357e231af3 + OpenBSD-Commit-ID: b9ac820018875aeb5b43ae2119a70c16a5cd2aef -commit 511f5bc41aeca7f6ee6611e9b24d48e4dd6ae3d5 +commit 1cfbed8a131de166d86fbf5ac3245d55046cfab3 Author: djm@openbsd.org -Date: Thu Mar 5 05:35:44 2026 +0000 +Date: Mon Jun 29 02:08:55 2026 +0000 - upstream: correctness wrt draft-ietf-sshm-ssh-agent: + upstream: Fix bounds checking when signing messages of length - extension requests should indicate failure using - SSH_AGENT_EXTENSION_FAILURE rather than the generic SSH_AGENT_FAILURE - error code. This allows the client to discern between "the request - failed" and "the agent doesn't support this extension". - - ok markus@ + greater than will fit in a size_t. In OpenSSH, messages sizes are bounded by + SSHBUF_SIZE_MAX so this was unreachable. From Swival scanner. - OpenBSD-Commit-ID: d15d89f210cc973271d68147f09550163df731c9 + OpenBSD-Commit-ID: 31ab874abe21a528fa995d78023c5ad9444a31e1 -commit 2a387ba37452971747d2f00db7d4c18b4f2c45ed -Author: dtucker@openbsd.org -Date: Tue Mar 3 09:57:25 2026 +0000 +commit c58b363e4f7c10134b583fc92556229bf6c2c16b +Author: djm@openbsd.org +Date: Mon Jun 29 01:58:29 2026 +0000 - upstream: Replace all remaining instances of u_intXX_t types with the + upstream: fix ECDSA order check for curves with cofactor != 1. All - C99 equivalent uintXX_t types. ok djm@ + supported EC curves have cofactor 1, so this is a nop. From Swival scanner - OpenBSD-Commit-ID: d9b81151266adb129574ce268af49f14ac23e65b + OpenBSD-Commit-ID: 4ae44cc97714fcb6d19fa56714ede56c1ef521e1 -commit bb781f02d4efd178e329a62a838962bee16e3e9b +commit c1cebbc7c69acfe5df07b4a95e4c32cebc3e105a Author: djm@openbsd.org -Date: Mon Mar 2 02:40:15 2026 +0000 +Date: Mon Jun 29 01:53:21 2026 +0000 - upstream: Move banner exchange to sshd-auth process + upstream: avoid situation where sftp_download() could get stuck in - Previously, exchange of the initial SSH- banners was performed - by the privileged sshd-session monitor. This moves it to the - unprivileged sshd-auth subprocess, removing ~200 LoC from the - monitor's privileged attack surface. + a loop if a broken server repeatedly returned zero length while reading a + file. Identified by Swival scanner - The monitor gains a new "setcompat" RPC to allow sshd-auth to - inform it of bug compat flags picked up from the client's banner. + OpenBSD-Commit-ID: 53f1de5065ff01952d2abb51747c2418ce21cd96 + +commit 1b39f39657d2e58f8ec57341581a39bbf0be645b +Author: djm@openbsd.org +Date: Mon Jun 29 01:47:21 2026 +0000 + + upstream: avoid download to server-controlled path when performing - feedback dtucker@, ok markus@ deraadt@ + download on the commandline. From Swival scanner - OpenBSD-Commit-ID: d767eb1183630d754d521d9f0d84a6c72fbe7fc8 + OpenBSD-Commit-ID: d1b2c44305fdfe6d51eed9ecc727e59478bf311f -commit b50b881b17ab15e34b5e57b159b65f2a02725798 -Author: Darren Tucker -Date: Sun Mar 1 09:46:39 2026 +1100 +commit 36480181fa22f98e180b4f9e10203480c0346c78 +Author: djm@openbsd.org +Date: Sun Jun 28 23:47:16 2026 +0000 - Try -lstdc++ for libcrypto before giving up. + upstream: resist that return ".." via remote glob during + + remote/remote copies, similar to fixes for bz3871 for remote/local copies. + From Swival scanner - BoringSSL recently added destructors to libcrypto, which requires - linking against libstdc++, so when checking for a working libcrypto if - at first the link fails, try again with -lstdc++ before giving up. + OpenBSD-Commit-ID: c0c20a1b746db55c08e53658bf21ea9405b300a5 -commit c26d90e5ad05372b63dbb8727cb6c23a6505a2fb -Author: Darren Tucker -Date: Sun Mar 1 09:41:39 2026 +1100 +commit 8dec7df34b38ea510b5548a020f2664e59700d23 +Author: djm@openbsd.org +Date: Sun Jun 28 23:31:28 2026 +0000 - Remove BoringSSL rpath as it's statically linked. + upstream: avoid possible NULL deref; from Swival scanner + + OpenBSD-Commit-ID: 62ea8e12b7cddee933596e72f8ab0f7364147c0f -commit c65f4d2586416274e92720c9e1e745422e182488 -Author: dtucker@openbsd.org -Date: Tue Feb 24 01:50:51 2026 +0000 +commit 09c2eeb9c8a0f42716d67548c75a6f4870732caa +Author: djm@openbsd.org +Date: Fri Jun 26 06:17:13 2026 +0000 - upstream: Use fmprintf instead of logit for challenge-response name and + upstream: mention that ssh-keyscan output is only as trustworthy as - info to preserve UTF-8 characters where appropriate. Prompted by github - PR#452, with & ok djm@. + the network between it and the SSH server; ok markus@ - OpenBSD-Commit-ID: e6361242329ec6925571478f60f4739726aad308 - -commit acf749756872d7555eca48514e5aca6962116fb2 -Author: Darren Tucker -Date: Tue Feb 24 11:28:11 2026 -0500 - - Add AWS-LC and BoringSSL as potential libcryptos. + OpenBSD-Commit-ID: 067845df7e8eb776408de5f23a2e6e7019945834 -commit c25254d1516df5e57affc0e391ed6ead8267b637 +commit 6f74eb3c56f8dc4886d2bc5b068c5bf82cb6db74 Author: Darren Tucker -Date: Tue Feb 24 11:16:11 2026 -0500 +Date: Thu Jun 25 08:14:47 2026 +1000 - Add self-hosted status to main README now it's public. + Dropbear master -> main here too. -commit 5da0ccec2b5806f104913465b62fea475b2e15bb +commit b0894a23a6bcb4f008d119854cb520f0b44b0973 Author: Darren Tucker -Date: Tue Feb 24 11:10:16 2026 -0500 +Date: Wed Jun 24 22:05:05 2026 +1000 - Remove anchor to specific release notes version. + Dropbear's master is now main. -commit d7a9cd696a316c71e4c16f4158dc516b94abd863 -Author: Darren Tucker -Date: Mon Feb 23 21:34:48 2026 -0500 +commit aa60cf3f41e89530448a720e08ec31a6d8ffd79e +Author: dtucker@openbsd.org +Date: Wed Jun 24 11:59:09 2026 +0000 - Remove potentially leftover include compat shims. + upstream: Avoid printf("%s", NULL) since it's not guaranteed to be safe - If we don't need a specific shim, ensure it does not exist. Prevents - confusion if configurations change or the directory is reused across - different platforms. + and will segfault on some -portable platforms. + + OpenBSD-Commit-ID: b49d588f8becf6363305aac42d7d9660fc7fe3ba -commit c940e709ae2155a4614bc3709e393d88fdddabde +commit 7c70c3d352f7e8f16ed799f03957ee87840da4e6 Author: Darren Tucker -Date: Mon Feb 23 20:54:55 2026 -0500 - - Check regress passwd is set before enabling kbdint. +Date: Wed Jun 24 19:22:36 2026 +1000 -commit 4ed5f9ecca9ed867c9f1040a3425af35f0703675 -Author: dtucker@openbsd.org -Date: Tue Feb 24 00:39:59 2026 +0000 - - upstream: Remove leftover debugging. + Fix handling of rh-allow-sha1-signatures on Cygwin - OpenBSD-Regress-ID: e778d76b21696a14db80f31b9e79601f2d7a9abf + The format of openssl.cnf has changed, so append to it instead of trying + to insert into it. Test that openssl can sign RSA with SHA1 before + proceeding. -commit a07a53b00e9aeadb420336783d219be012d88ba1 +commit a4c5d09657860cb8583e4cb176b2396fc8bdb523 Author: Darren Tucker -Date: Mon Feb 23 15:22:10 2026 -0500 +Date: Wed Jun 24 19:05:12 2026 +1000 - Activate kbdint test on PAM configs. + Make -j2 for faster builds. -commit 5f98660c51e673f521e0216c7ed20205c4af10ed +commit 110117accb95fc310a3923115e9316a9748ff6ae Author: Darren Tucker -Date: Wed Feb 18 12:39:31 2026 -0500 +Date: Wed Jun 24 19:04:48 2026 +1000 - Install libaudit-dev for --with-audit=linux test. + Set CYGWIN at top-level. + + The ensures the symlinks created in any step (eg, logs) are native + symlinks and can be understood by the log upload step. -commit c9fcea8865b255d4b7566b28dce4af348d2bfbd6 -Author: Darren Tucker -Date: Wed Feb 18 11:22:37 2026 -0500 +commit 8058c5bdb507591b79ec926221fbe6fcc296d432 +Author: djm@openbsd.org +Date: Wed Jun 24 06:55:12 2026 +0000 - Enable BSM audit test on FreeBSD VMs. + upstream: mention a caveat regarding GSSAPIStrictAcceptorCheck in + + some environments + + OpenBSD-Commit-ID: aa7158d8f22cb34063c1c2d3cbcf30a9489847c2 -commit f1a9628cd7e415ce14e157d80c10b61514a22d13 -Author: Darren Tucker -Date: Wed Feb 18 10:59:02 2026 -0500 +commit 87e21b16d033700819a1381b9a2bfa2f8b3a217d +Author: djm@openbsd.org +Date: Wed Jun 24 06:53:57 2026 +0000 - Move BSM audit test to selfhosted runner. + upstream: add some logging to make debugging interactive/bulk + + classification mistakes easier next time (though I think we've got them all + now, really) - The vmactions VM on Github does not have the required libraries - installed. + OpenBSD-Commit-ID: 5fe3dd4e76ffba787a423e301095d55cf5b0f0dc -commit 97e8e66219d036404ae656060f0e0179b61f0614 -Author: Darren Tucker -Date: Wed Feb 18 10:51:09 2026 -0500 +commit 162cb8721ca0fdb71aaf00688ac7d59a81fc8d5f +Author: djm@openbsd.org +Date: Wed Jun 24 06:53:11 2026 +0000 - Increase riscv64 test coverage. + upstream: add a missing channels type for bulk/interactive - The machine running the tests has been replaced with a faster one. + classification bz3972; ok dtucker@ + + OpenBSD-Commit-ID: 9c9442ea14be74877e2c876b1fe9fa20d158dd97 -commit e5e18432a27b909aa2194ef0b28a5d49f0e6b3a6 +commit 5dac5a9252074fb39da617ffc123830266614a4c Author: Darren Tucker -Date: Wed Feb 18 10:49:35 2026 -0500 +Date: Wed Jun 24 12:19:53 2026 +1000 - Whitespace fix. + Set build options in /etc/mk.conf once at startup. -commit b0463306174941274a1f96eb705618e036832920 -Author: Darren Tucker -Date: Wed Feb 18 09:48:55 2026 -0500 +commit 512bfedf61129788d680210081e89843858dde85 +Author: dtucker@openbsd.org +Date: Mon Jun 22 12:28:48 2026 +0000 - Add test coverage for all of the --audit= configs. + upstream: Check return values from malloc. + + OpenBSD-Regress-ID: 28c8ab94a4fa5d047cec9c865b10bbf3c9ccf6d1 -commit 84206bde8adbef2dfe4f5b97dd23399827015333 -Author: djm@openbsd.org -Date: Wed Feb 18 03:04:12 2026 +0000 +commit e683097d90e4698893c86a6f61c8c994b68cbcc6 +Author: dtucker@openbsd.org +Date: Mon Jun 22 12:08:33 2026 +0000 - upstream: same treatment for remote/remote copies (i.e. scp -3): + upstream: Check return value of sscanf. - adjust permissions on destination directory only if we created it or -p was - requested. bz3925 - - OpenBSD-Commit-ID: d977006df7b8330e06ceaa319383b347f1aca3ef + OpenBSD-Regress-ID: e06a8c769541b1aa7d663cc8859ddabd93847e81 -commit c3631567d9f77c2d073764e4b40f249687f4083e -Author: djm@openbsd.org -Date: Wed Feb 18 02:59:27 2026 +0000 +commit b88165a06c8e195f267909de002450245e60002e +Author: tb@openbsd.org +Date: Sun Jun 21 19:23:56 2026 +0000 - upstream: when uploading a directory using sftp/sftp (e.g. during a + upstream: annotate tm_wday = -1 with /* sentinel for error */ per + + timegm(3) manpage - recursive transfer), don't clobber the remote directory permissions unless - either we created the directory during the transfer or the -p flag was set. - bz3925 ok dtucker@ + suggested by deraadt - OpenBSD-Commit-ID: d66f40d01de05c9ec4029fab5413325301039b3a + OpenBSD-Commit-ID: 2fa92f0b826f0ab9e5d1cb0b2243b8e2f80951b2 -commit 2b0f4a72bd87bef7cc9f0a1889cfc98545cbb158 +commit 0d08d384a6783d3f3bc5a01d10015f527e0792ba Author: djm@openbsd.org -Date: Tue Feb 17 21:45:07 2026 +0000 +Date: Fri Jun 19 05:26:04 2026 +0000 - upstream: make IPQoS first-match-wins in sshd_config as it's + upstream: remove cipher_set_keyiv() as nothing uses it from - intended to be bz3924 - - OpenBSD-Commit-ID: 42753eb8400ab09713c69ace6fa8bfdde133f942 - -commit 0e35095babe04ba1159e8029133e7f71e53d8fdb -Author: jsg@openbsd.org -Date: Mon Feb 16 23:47:06 2026 +0000 - - upstream: remove duplicate includes; ok dtucker@ + Loganaden Velvindron - OpenBSD-Commit-ID: 6b9191bc1a0f4320c926d5ccd9f36b09f0f3bcaf + OpenBSD-Commit-ID: 2a6636388028e6f7aa6837d6484a369f3d9c0818 -commit 9eb778cfde5bca1d84bbad74d8664256301bb13b +commit 10715f25c40f5f7c670c341fadc52fbe1935db08 Author: Darren Tucker -Date: Mon Feb 16 18:58:04 2026 -0500 +Date: Mon Jun 22 21:28:58 2026 +1000 - Restore utf8.h removed earlier as it's needed. - - ... for msetlocale prototype. + Output Actions allowlist for uploading to Github. -commit 723b76c8a358875cd53376c9a169887ba7a4b088 +commit 01404fa5da11ed08c6ebecd09aaa3ebfbd79f206 Author: Darren Tucker -Date: Mon Feb 16 18:32:41 2026 -0500 +Date: Mon Jun 22 19:00:15 2026 +1000 - Removed duplicate includes; spotted by jsg@. + Add script to lookup and pin Actions to hashes. + + Update recently changed Cygwin Actions and pin remaining unpinned ones. -commit df2b28163ac75e023837de445d6492dc57359105 -Author: Darren Tucker -Date: Sun Feb 15 14:16:56 2026 -0500 +commit faa646a9bf6c8d0ec2d8a52dcd155979c8f7eb8e +Author: El Mehdi Abenhazou +Date: Wed Jun 3 02:02:31 2026 +0100 - Remove "draining" of PAM prompts. + ci: pin upstream.yml actions to full commit SHAs - With the previous commit, both prompts and info/error error messages are - returned to keyboard-interactive immedately and none are accumulated, so - there will never be any un-drained prompts. ok djm@ + Signed-off-by: El Mehdi Abenhazou -commit b9a6dd4d66ee14577494d550b396d0452bf05e1e -Author: Marco Trevisan (Treviño) -Date: Tue Oct 17 04:27:32 2023 +0200 +commit 983096a7b27eaf789b5ceb321867d4511ba779c3 +Author: El Mehdi Abenhazou +Date: Wed Jun 3 02:02:30 2026 +0100 - auth-pam: Immediately report interactive instructions to clients + ci: pin GitHub Actions to full commit SHAs - SSH keyboard-interactive authentication method supports instructions but - sshd didn't show them until an user prompt was requested. + Pinning actions/checkout, actions/upload-artifact, and + cygwin/cygwin-install-action to their full commit SHA instead of + mutable branch/tag references (main, master). - This is quite inconvenient for various PAM modules that need to notify - an user without requiring for their explicit input. + Using mutable refs means a compromised or malicious update to the + action repository could silently alter the workflow behavior. + Pinning to SHA makes the exact version immutable and auditable. - So, properly implement RFC4256 making instructions to be shown to users - when they are requested from PAM. - - Closes: https://bugzilla.mindrot.org/show_bug.cgi?id=2876 + Signed-off-by: El Mehdi Abenhazou -commit a1158bba43e00240c00c530596de2d4e1d405b50 -Author: Matthew Heller -Date: Mon Oct 14 09:25:41 2024 -0500 +commit 0d156d385e1e9c31bd5fb3652cf620a1f51c9b19 +Author: dtucker@openbsd.org +Date: Tue Jun 16 22:27:10 2026 +0000 - fix duplicate PAM msgs, missing loginmsg reset + upstream: Factor out hex2bin into a shared helper function. - without this change in mm_answer_pam_account all messages added in - auth-pam.c sshpam_query(...) case PAM_SUCCESS end up sent here, then are - still sitting in the loginmsg buffer and printed a second time in - session.c do_login(...) + Replace sscanf %hhx (which is C99) with plain %x for better compatibility + in -portable. ok djm@ + + OpenBSD-Regress-ID: 4d30bb27ffdf2154f1a9f2317df18d256717b300 -commit 7a59f55e621c841aab187c96e0f3271c5c799709 +commit b9d134a0b16a1810e9bbfac5bc687f5dbc75e7fa Author: dtucker@openbsd.org -Date: Mon Feb 16 00:45:41 2026 +0000 +Date: Tue Jun 16 10:58:42 2026 +0000 - upstream: Reorder headers to match KNF and Portable. + upstream: Use awk instead of cut to help -portable. - ID sync only. + Some platforms have size limits on cut. - OpenBSD-Commit-ID: b7f9700d07b532eb3720f7bd722b952e31b1752f + OpenBSD-Regress-ID: fe871e8ed43fd92efb0df76f61c5cc9c5429ea82 -commit c5cee49a0c5721532716365f32977fc02eeea1d5 +commit 60978ddb08701d409c8236765caab10d1acded1b Author: dtucker@openbsd.org -Date: Sun Feb 15 22:29:30 2026 +0000 +Date: Tue Jun 16 09:00:47 2026 +0000 - upstream: Add basic test for keyboard-interactive auth. - - Not enabled by default since it requires some setup on the host. + upstream: Include stdarg.h for va_list (needed for xmalloc.h). - OpenBSD-Regress-ID: aa8a9608a2ea2e5aaa094c5a5cc453e4797cd902 + OpenBSD-Regress-ID: 34a6d5db48eec77f92f868093dfa0bfc10ae4622 -commit 07c6413e7bf08b7bfc6fd543eded9da68898e230 -Author: jsg@openbsd.org -Date: Sat Feb 14 00:18:34 2026 +0000 +commit 3de49e0d281ac7efb766f06eb2942ae147f64bbb +Author: dtucker@openbsd.org +Date: Tue Jun 16 08:15:35 2026 +0000 - upstream: remove unneeded includes; ok dtucker@ + upstream: Include stdlib.h for malloc/free and sort headers. - OpenBSD-Commit-ID: bba6e85492276c30c7a9d27dfd3c4c55fa033335 + OpenBSD-Regress-ID: 4f5f427b131f5d6b32ed107b9bef098153f768ce -commit d8b806a2e6cd50c729e5d2bad569955a1df33f63 +commit 61ca39c119108e95f94e3d914aa6fd79d99e288d Author: Darren Tucker -Date: Sun Feb 15 13:31:52 2026 -0500 +Date: Tue Jun 16 18:16:32 2026 +1000 - Remove obsolete comment referencing auth-chall.c. + Remove check for OpenSSL w/out AES192/256. - It was removed in commit 6cb6dcff along with the rest of the SSH1 server - support. + This was the case for some old Solaris versions, but the support for it + has long been removed from our compat layer so there's no point checking + for it. -commit 3e8a45e0eeb5c84f12ac04ea7cc2f831c91c263b -Author: Marco Trevisan (Treviño) -Date: Mon Oct 16 21:15:45 2023 +0200 +commit f433c09931665b1139dc9ef0951d3540242e4a38 +Author: djm@openbsd.org +Date: Mon Jun 15 06:36:52 2026 +0000 - auth-pam: Add an enum to define the PAM done status + upstream: use different strategy to check whether keys are present or - Makes things more readable and easier to extend + absent in the agent; helps some -portable tests on platforms that have stupid + grep(1) + + OpenBSD-Regress-ID: 0cee7ecc437eee7471dc6ccc3b3a0c2b60c1ad2d -commit 9b0e50b4132679f0c09c0f1272bf1c45959103ea -Author: Marco Trevisan (Treviño) -Date: Tue Oct 17 04:35:17 2023 +0200 +commit 860ed04158f2c6dc870ea7c98c23dcafc7772dd4 +Author: djm@openbsd.org +Date: Mon Jun 15 06:24:20 2026 +0000 - auth-pam: Add debugging information when we receive PAM messages + upstream: avoid use of paste(1); helps portable + + OpenBSD-Regress-ID: ce3ad41b34af9fc16af83e4711a62231ee52a95c -commit c2447697aaecae11d164f1ba30e06d14b5cabcdd -Author: Darren Tucker -Date: Fri Feb 13 15:34:44 2026 -0500 +commit f5f02aafe89971d838d7fbc6b0cf240cee4d48bc +Author: Damien Miller +Date: Mon Jun 15 12:53:53 2026 +1000 - Remove DragonFlyBSD workaround for sys/mount.h. - - ... since we're not not including it at all any more. + another place mldsa-ed25519 keys need deactivation -commit 8b3a0552054106feb036c632fc844f878568799f -Author: dtucker@openbsd.org -Date: Fri Feb 13 19:06:18 2026 +0000 +commit 1d6064d25fed17b184ead85ef6fddec1a2132c53 +Author: djm@openbsd.org +Date: Mon Jun 15 01:55:44 2026 +0000 - upstream: Replace with + upstream: fix multiple problems with testing hostkey types that are not - The former is a portability hassle, but it turns out the only thing we - need from it is PATH_MAX which we can get directly from limits.h. + enabled by default. - OpenBSD-Commit-ID: ccfbbd678bef3a3930ae89da456645c3ee5f83c0 + 1) Add all hostkey types in the "multiple hostkeys" subtest. + Previously known_hosts was accidentally clobbered, causing + only the last added hostkey type to be used. + 2) Explicitly enable the hostkey types under test via + HostKeyAlgorithms + + OpenBSD-Regress-ID: 8f12d18b79b5cc8a748e187a0e95529cd85a9dcc -commit db475199639667197b12b3aa5205de71ef102e23 -Author: jsg@openbsd.org -Date: Fri Feb 13 01:04:47 2026 +0000 +commit ebdaacf4907033af1cbf1fef593436081dcd67a7 +Author: Damien Miller +Date: Mon Jun 15 11:43:52 2026 +1000 - upstream: remove unneeded forward struct declaration ok djm@ + bring back mlkem768x25519-sha256 stubs - OpenBSD-Commit-ID: a0c97e919667394bef8dbf31df72af3ba07542e9 + should fix C89 compile -commit 803e55602848db6dbe4fe27ed7fd3881a8699b9d -Author: Chris Rapier -Date: Thu Feb 12 14:53:31 2026 -0500 +commit b35a6a153f4164a56174e4795d4384867349e9aa +Author: Damien Miller +Date: Sun Jun 14 20:32:12 2026 +1000 - Can't have comments in the Makefile. - Builds and passes all tests. + don't build ML-KEM/ML-DSA code with -Date: Thu Feb 12 14:04:13 2026 -0500 +commit 1c46384db91a724a214ce96297d64c7ea9274a4c +Author: Damien Miller +Date: Sun Jun 14 20:24:25 2026 +1000 - fixing typos + include includes.h -commit eb18a09a952d7ad78ab277435465591fcd04d51d -Merge: 6e486d27c 957cb0fbe -Author: Chris Rapier -Date: Thu Feb 12 13:55:42 2026 -0500 +commit ea505c83ecae67c66c020f03b964cf471055191e +Author: Damien Miller +Date: Sun Jun 14 18:56:31 2026 +1000 + + provide a htobe32() replacement + +commit 8e0cb471774e39a308e41cf5890823dfb418fd5b +Author: Damien Miller +Date: Sun Jun 14 15:02:24 2026 +1000 - Merge to OpenSSH Master. Not tested yet + hook up new regress/unittests/crypto -commit ae51e05dbd840ad674fee754f33c0e2fd141074e +commit 5a474d1bf338a895ce5973883c2f79d766f7dd42 Author: djm@openbsd.org -Date: Wed Feb 11 22:58:23 2026 +0000 +Date: Sun Jun 14 04:08:05 2026 +0000 - upstream: very basic testing of multiple files in RevokedKeys and + upstream: unit and regression tests for composite PQ ML-DSA44/Ed25519 + + keys. - RevokedHostkeys + Includes a new unittests/crypto test that tests basic functionality + of the underlying crypto primitives against public test vectors - OpenBSD-Regress-ID: 6cee76bcc4bd6840bc8d39dd0d32d724e1427aa7 + OpenBSD-Regress-ID: 4463b2e8adec391efa24a953f3c911b72892ca80 -commit 2f51e29b9a0ffd7acb9dc70d90defa466b5695d4 +commit db1bad146ff3e9aa8e2e8eac926b185870417b2f Author: djm@openbsd.org -Date: Wed Feb 11 22:57:55 2026 +0000 +Date: Sun Jun 14 04:16:19 2026 +0000 - upstream: support multiple files in a ssh_config RevokedHostKeys + upstream: make crypto_sign_ed25519_keypair_from_seed non-static. - directive bz3918; ok dtucker + The new ML-DSA/ed25519 code needs it - OpenBSD-Commit-ID: 0ad2eacf836f912f347846ab84760799033dd348 + OpenBSD-Commit-ID: 48d00a2094bca8e422494aaa76105c708837436e -commit 135a62238a479c7369f2b2d5dafb921ddc1c2b74 +commit 81ca1451bf94edd9533c4f6787130f2396219049 Author: djm@openbsd.org -Date: Wed Feb 11 22:57:16 2026 +0000 +Date: Sun Jun 14 03:59:34 2026 +0000 - upstream: support multiple files in a sshd_config RevokedKeys + upstream: Add experimental support for a composite post-quantum - directive bz3918; ok dtucker + signature scheme that combines ML-DSA 44 and Ed25519 using the construction + specified in draft-ietf-lamps-pq-composite-sigs. There's also an early draft + documenting use of the integration of this scheme into SSH as + draft-miller-sshm-mldsa44-ed25519-composite-sigs - OpenBSD-Commit-ID: 9fc58c4e676f8e9ed2e3a0da666242a17b8a55b2 - -commit 3160f2a97e875bfa9454f98899cbccad48c96ff4 -Author: dtucker@openbsd.org -Date: Wed Feb 11 17:05:32 2026 +0000 - - upstream: Add includes used in Portable to reduce diffs. + This scheme is not enabled by default. To you use, you'll need + to add it to HostKeyAlgorithms, PubkeyAcceptedAlgorithms, etc. + Keys may be generated using "ssh-keygen -t mldsa44-ed25519". - OpenBSD-Commit-ID: 186c60cf2da0ddb075d5bc4879e87bbd8779b7e4 - -commit 6a756f3f7b9f87f24e948ec1de0266f5c1587811 -Author: dtucker@openbsd.org -Date: Wed Feb 11 17:03:17 2026 +0000 - - upstream: Remove unused sys/queue.h include. + The ML-DSA implementation comes from libcrux. Thanks to + Jonas Schneider-Bensch and Jonathan Protzenko for their work to + make this available. - OpenBSD-Commit-ID: 564f75672e27f1006f280614934eb304abe69167 - -commit c169300df12b9aa7005ff6e61880a7e007e83bc5 -Author: dtucker@openbsd.org -Date: Wed Feb 11 17:01:34 2026 +0000 - - upstream: Reorder includes and defines to match both KNF and + Consensus is that it's time to get this in to allow people to + experiment with it. - Portable. + feedback markus@ tb@ logan@ deraadt@ - OpenBSD-Commit-ID: f3f179c095f8e4787ded5f450e2842881f6b8ab2 + OpenBSD-Commit-ID: 85f2d41e3d3374b4e8c28a45a7c92f153c4489e2 -commit 1a4eb511abaf3522b84fa5697524b81b4865279b -Author: Darren Tucker -Date: Wed Feb 11 17:36:42 2026 -0500 +commit b7e552138b8861469295e33e1457040e3f747d06 +Author: djm@openbsd.org +Date: Sat Jun 13 00:37:13 2026 +0000 - Factor out RNG reseeding in to a single function. + upstream: when replying to a "query" SSH_AGENTC_EXTENSION request, - sshd and sshd-session both reseed the RNG after a fork. Move the - existing reseed_prngs() function into entropy.c and use for both. - Clean up entropy.h too. ok djm@ - -commit 81746188e9333b166b4c31f9654d8eb249ddd897 -Author: Darren Tucker -Date: Wed Feb 11 16:47:27 2026 -0500 - - Remove do_pam_chauthtok since it's no longer used. + don't append an SSH_AGENT_SUCCESS to the reply to the query. bz3967 ok + dtucker@ + + OpenBSD-Commit-ID: b51418708096e26dbf73a0c1d3cb49b7352bc899 -commit f1b9e0f7f1f1ed5be2bd1c39bda03fc99a1cf5d8 +commit 5af8f3f290bd892352eb007866c066b7bf4a4385 Author: dtucker@openbsd.org -Date: Wed Feb 11 16:57:38 2026 +0000 +Date: Sun Jun 7 08:50:17 2026 +0000 - upstream: Pass actual size of the buffer to hostname() instead of a + upstream: Make crypto_sign_ed25519_keypair_from_seed() - define that's probably the same. ok millert@ djm@ + static to prevent compiler warnings since it's only used within ed25519.c. - OpenBSD-Commit-ID: 7c97b22439100b4193404ccfa1e5f539c5a8d039 + OpenBSD-Commit-ID: cf8b1e8f364167eb1766f646cc18a40f32242991 -commit 4ef24496b7c4c918d4d3a049f83739fbe2e36e9f +commit 5ebfdf3afaede40b1f0f9b5874ba53bf9d21d6d5 Author: dtucker@openbsd.org -Date: Mon Feb 9 22:15:45 2026 +0000 +Date: Sun Jun 7 08:21:07 2026 +0000 - upstream: De-underscore __inline__ to match -portable + upstream: Import updated moduli - (and every other use of it in ssh). ID sync only. - - OpenBSD-Commit-ID: 83c913d5e2345635bc5434167ed67cec5409d494 + OpenBSD-Commit-ID: c3081ccc6e4c1cb21e68c36f5a92e6d9f09e70b3 -commit c8972792e5ce599e584bbe1aa084cc4056f1afe5 -Author: dtucker@openbsd.org -Date: Mon Feb 9 22:12:48 2026 +0000 +commit 47af21eb8d480c0f368a629ab58e31b993ed28f2 +Author: Damien Miller +Date: Sun Jun 7 09:56:41 2026 +1000 - upstream: Remove references to skey auth which is long gone. + sync fmt_scaled.c with OpenBSD upstream + + Notably picks up this commit: - ID sync only. + revision 1.24 + date: 2026/06/06 23:49:25; author: djm; state: Exp; lines: +28 -12; commitid: oznzDs0MaUT3FEqO; + rearrange scan_scaled(3) ordering of multiplications and divisions + to better preserve accuracy for large exponents. From metsw24-max + via https://github.com/openssh/openssh-portable/pull/671/ - OpenBSD-Commit-ID: 0c2340566c399f7f74fe4c5366394974cd6fd122 + ok tb@ -commit db779679839d2798de7cda196a3fe750a12845e8 -Author: dtucker@openbsd.org -Date: Mon Feb 9 22:11:39 2026 +0000 +commit e9916c44c1324ab9ab022719e4df08a390a83014 +Author: djm@openbsd.org +Date: Fri Jun 5 08:53:07 2026 +0000 - upstream: Remove unused OpenSSL includes, + upstream: pass >9 commandline arguments to the internal-sftp server, - that are no longer used, even when building with OPENSSL=yes. + previously they were silently dropped; reported by Steve Caffrey ok deraadt@ - OpenBSD-Commit-ID: e97e3e551ade9aee994b80a1d5851be6f32288e3 + OpenBSD-Commit-ID: ee6cd5430a3ca027c3223af54b58ad3cc7ccd624 -commit 8ec21f6274108e93601173ec4e6f7528b90b0003 -Author: dtucker@openbsd.org -Date: Mon Feb 9 22:09:48 2026 +0000 +commit 70d7044a966a541d9df6002fbeb62d005555cc78 +Author: djm@openbsd.org +Date: Fri Jun 5 08:48:43 2026 +0000 - upstream: Use https for URLs. + upstream: avoid truncation of pathnames headed to lstat() for - ID sync only. + systems where PATH_MAX is not the actual max; reported by sahvx655-wq via + GHPR688 - OpenBSD-Commit-ID: 85b2919e95e6d2bfdeddf5e3b0709fb5b6b4c438 + OpenBSD-Commit-ID: fcbeeff99d857f2f3916ad06570fa05fc38b0f07 -commit c3eaa953ae78e581d7ba2327beea35206a14bc1e -Author: dtucker@openbsd.org -Date: Mon Feb 9 21:38:14 2026 +0000 +commit 37bf1431aa0f5e746f9ae0247f52da1e8b5758d6 +Author: djm@openbsd.org +Date: Fri Jun 5 06:51:02 2026 +0000 - upstream: Remove unused OpenSSL includes, - - which are no longer used even when building with OPENSSL=yes. + upstream: rename a variable to be more accurate - OpenBSD-Commit-ID: 31adb21bf3f8f5c13cde59229f1b85c20f19a858 + OpenBSD-Commit-ID: bf277f2832125eb40ac2c9fa3ea66e31214f2131 -commit 280cf58afe71bf34141e732d30676367f0150bbe -Author: dtucker@openbsd.org -Date: Mon Feb 9 21:23:35 2026 +0000 +commit 7763a38bc2595be50baf1d72b19bf4720e41e8e3 +Author: djm@openbsd.org +Date: Thu Jun 4 04:26:51 2026 +0000 - upstream: Remove now-unused SKEYQUERY enums from monitor_reqtype. + upstream: add signature malleability and pubkey validity checks to - ID sync only. + ed25519 verification (SSH doesn't depend on these properties) Pointed out by + Soatok Dreamseeker - OpenBSD-Commit-ID: dab93b58e69c754887507e5557a81a0b5b84d734 - -commit bb2703365ede3b4e13fdfa1c250ac88408e75f38 -Author: dtucker@openbsd.org -Date: Mon Feb 9 21:21:39 2026 +0000 - - upstream: Remove now-unused openssl includes since sshd.c no longer + Add an explicit-seed variant of the keygen function. - needs them, even when built with OpenSSL. + feedback / "looks fine" tb@ - OpenBSD-Commit-ID: ceaa0394db1520e92d75c37eea58130d44ba93c9 + OpenBSD-Commit-ID: 2a71926bfda24628cf34a88357f44a790e338d5d -commit 8a5d591c9f42933c49ece95e49c116d684d6cca0 -Author: Darren Tucker -Date: Wed Feb 11 11:38:58 2026 -0500 +commit 65c6ac0a82f8bc3faf5a18fef36112fec1b54fc2 +Author: djm@openbsd.org +Date: Tue Jun 2 06:18:27 2026 +0000 - Don't create sys/mount.h shim except on DragonFly. + upstream: refer to RFC9987 instead of I-D - Fixes build on Mac OS X. - -commit 660cec36fe10dddd34467e7bede5a8f94d48c6a5 -Author: Chris Rapier -Date: Tue Feb 10 16:22:27 2026 -0500 - - typo in README.md + OpenBSD-Commit-ID: 6b273c50c2aa818b9144b8d9ab568c4239023297 -commit 0fa6504d63e6ef79ab9960bb2c4ec648e016b062 -Author: Chris Rapier -Date: Tue Feb 10 16:18:53 2026 -0500 - - update README.md. No code change. - -commit 957cb0fbe87b6ab76045e8dc99426db6afb54057 +commit c9ebebb22fa50ca50bd036599028d7e09f841c3f Author: Darren Tucker -Date: Tue Feb 10 08:55:53 2026 +1100 +Date: Tue Jun 2 21:57:42 2026 +1000 - Minor resync with upstream + Reformat setup_ci command line. - Reorder definitions add whitespace to eliminate diffs vs upstream. - -commit 4922635d3e66f9107c5b68a0a3fa57ddf0d820ae -Author: Darren Tucker -Date: Tue Feb 10 07:22:30 2026 +1100 - - Factor out COMPATINCLUDES into its own variable. + This prevents setup_ci from running twice on Cygwin due to different + parsing of the command line since on Windows it's run via Powershell. -commit 3e9c4ed3b0e5d3890fcd2cbc9c3b595f17ea1946 +commit 60343e46d5f8b79137a14d2ea5c85bf0b7359cc1 Author: Darren Tucker -Date: Tue Feb 10 05:34:46 2026 +1100 +Date: Tue Jun 2 22:20:44 2026 +1000 - Provide compat shims for sys/{mount.h,statvfs.h). + Fix search for awk formatter. - In addition to shimming on platforms that don't have them, we also need to - shim sys/mount.h on DragonFlyBSD since it uses its native STAILQ_ENTRYs - which our compat queues.h does not have, which causes sftp-server.o to - not build. This is a little icky, but it limits the blast radius to - just one source file on only DragonFly. ok djm@ + AC_PATH_PROG only takes a single binary to look for, AC_PATH_PROGS is + what's needed for more than one. Looks like an error by me in 285546b. -commit eeb671fa2f0fd7dda4c6b726098fe28016dc185b +commit 7e5590cf8ff732a946629b6f766c7a2c9b2ac425 Author: Darren Tucker -Date: Tue Feb 10 03:39:45 2026 +1100 - - Shim and . - - This significantly reduces the diff vs upstream making future syncs - less painful. ok djm@ +Date: Tue Jun 2 18:49:02 2026 +1000 -commit 47828dbd95c095d0cad327e12bb6859a510833c8 -Author: dtucker@openbsd.org -Date: Sun Feb 8 19:54:31 2026 +0000 - - upstream: Reorder headers according to KNF, - - and pull in a few we don't have from Portable. - - OpenBSD-Commit-ID: d83f6c75da7bfb16bbff40fd2133d6eba4aba272 - -commit c73b8b09bf43be3dfe14bc0da349b352b280a74a -Author: dtucker@openbsd.org -Date: Sun Feb 8 17:51:43 2026 +0000 - - upstream: Include sys/socket.h to match -portable, - - eliminating one diff. + Replace shell-level timeout with dedicated command. - OpenBSD-Commit-ID: 7670fdf35b0c7aee41cd0d6ded86b4792e261f36 + It turns out the systems we run this workflow on all have timeout(1), -commit 9385d72dd36ba6050b5f7728c14e3edc8329fe95 -Author: dtucker@openbsd.org -Date: Sun Feb 8 17:50:49 2026 +0000 - - upstream: Reorder headers as per KNF. - - OpenBSD-Commit-ID: 3e29fabe20422454fd5d77f85c853e1e557f2181 - -commit 62439369181b9b1dabf1ec3c2de6a7fbfcfb45eb +commit 41bb8c1823a337dca1b027a1e5c560f6a5fc4acc Author: Darren Tucker -Date: Mon Feb 9 06:56:35 2026 +1100 +Date: Tue Jun 2 18:10:25 2026 +1000 - Remove openindiana VM test. + Add a single retry to VM package install steps. - When it works it's by far the slowest (>1h to install packages) and the - package installation is flaky. We can bring it back if their infra ever - improves. - -commit 43d0bf02d84a20a3f7c9992dabf8c109d9c25bed -Author: Darren Tucker -Date: Mon Feb 9 06:42:27 2026 +1100 - - Sync header order with upstream and KNF. - -commit a3742cc38a6aa48a653a1a6300bc825f083955af -Author: Darren Tucker -Date: Mon Feb 9 06:41:07 2026 +1100 - - Sync whitespace with upstream. - -commit b62198a19a53227ca166c62825ac72a7696c42ed -Author: Darren Tucker -Date: Mon Feb 9 05:02:36 2026 +1100 + These are potentially flaky due to network issues, so hopefully this + will reduce the number of manual retries needed. - Sync header order with upstream. - -commit 98fdb05f0c0d7a89a066225a94eafd7fce10163d +commit 14d88d4da7fb72d94239049d76c7651723b1a3d9 Author: Darren Tucker -Date: Mon Feb 9 04:09:26 2026 +1100 +Date: Tue Jun 2 17:44:12 2026 +1000 - Remove generic check for getpagesize. + Add includes.h for compat functions. - We have a more specific check later. + Fixes build on at least old AIX. -commit 249476f45dba9a92056bd2935aae7429f0f3b17c +commit e8c12cc085272894e7c14eb761e82ec7c0d8f599 Author: Darren Tucker -Date: Mon Feb 9 03:47:25 2026 +1100 - - Test KERBEROS5=yes builds on OpenBSD. - -commit 6adb65508efc2def558f50a56c5eada09ca500c9 -Author: dtucker@openbsd.org -Date: Sun Feb 8 15:28:01 2026 +0000 +Date: Mon Jun 1 20:43:31 2026 +1000 - upstream: Make ssh optionally build with Kerberos 5 against the - - Heimdal port. This updates the Makefiles and repairs some bitrot in headers, - resyncing them against Portable. To do this, "pkg_add heimdal" then "make - KERBEROS5=yes". ok djm@ - - (ID sync only) - - OpenBSD-Commit-ID: 31f95c9ba58aa7ba89264f1d80c79106042b1095 - -commit d6c672a8c16c8962e6b3022e279441fa6630cb86 -Author: dtucker@openbsd.org -Date: Sun Feb 8 03:30:15 2026 +0000 - - upstream: Remove sys/poll.h since we also have poll.h. - - Also removes one line of diff vs portable. - (ID sync only). - - OpenBSD-Commit-ID: 461bd0cd35bfad82bd06892ccb0ff0fac15d1d27 + setup_ci.sh: add timeout and allow one retry -commit 8605ed26334b9ae704b8abe51940b61bdfe1e974 -Author: dtucker@openbsd.org -Date: Sun Feb 8 00:16:34 2026 +0000 +commit de97e5a44c88179b834939b84cd555249382de0e +Author: djm@openbsd.org +Date: Mon Jun 1 08:27:28 2026 +0000 - upstream: Move setting of user, service and style earlier since + upstream: differentiate between execution failures and subsystem not - -portable needs to use these when setting up PAM. Removes two diffs vs - portable. + found when logging why a subsystem failed to start; GHPR#637 from cuiweixie - OpenBSD-Commit-ID: 8db130d42a3581b7a1eaed65917673d4474fc4fe + OpenBSD-Commit-ID: 42bc40dd6272b7f6726b069a8c4e16025a354056 -commit ecaaa4f9e44764e55c152a84af3d7efb63c50ce7 +commit 51db029b53488bc972deba13724034f8e35e6e38 Author: Darren Tucker -Date: Sun Feb 8 11:30:21 2026 +1100 - - Move USE_SYSTEM_GLOB into a glob.h compat shim. - - This moves the logic for selecting whether or not we can use the system - glob into configure, and if either don't have glob or can't use it, we - create the shim. Removes several diffs vs upstream. +Date: Mon Jun 1 18:26:31 2026 +1000 -commit 2a1a257612b7c6bcacd934149146a3da7411c485 -Author: dtucker@openbsd.org -Date: Sat Feb 7 18:04:53 2026 +0000 - - upstream: misc.h is needed for ForwardOptions in servconf.h. + Don't install shim for AWK=awk. - OpenBSD-Commit-ID: b241d81c499e273fc2d81c82d5b7c7b280827416 + If configure finds an undadorned awk, don't install the shim to prevent + recursive calls to it. -commit ad632364fb06f3bd1e9177e587d0040cf7958676 -Author: Jonas 'Sortie' Termansen -Date: Sat Nov 2 22:30:07 2024 +0100 +commit 2afcdf7b3e429428d9b6415e0c948001bf968477 +Author: Darren Tucker +Date: Mon Jun 1 17:40:03 2026 +1000 - Remove unused includes. + Pass awk detected by configure to regress tests. - netinet/in_systm.h is no longer in upstream and anything that actually - needs it will get it from includes.h. + Some platforms' basic awk don't have toupper, but other awks like nawk + or gawk do. Pass the one found by configure through to the regress + tests, and make a wrapper for it so we don't need to modify any tests. -commit 9ebce88be9d88605e02551fe7f65ef6a16f72667 -Author: dtucker@openbsd.org -Date: Sat Feb 7 17:10:34 2026 +0000 +commit 7b776066bc00a12ec3a7f9b04cf8a69a8d260c2c +Author: Darren Tucker +Date: Mon Jun 1 17:39:40 2026 +1000 - upstream: Also check for EWOULDBLOCK on system error. This is the - - same as EAGAIN on OpenBSD so is a no-op but removes a diff making portable - syncs easier. (ID sync only). - - OpenBSD-Commit-ID: 68a5dcc5e2a506208c40396c6366f67bbf3b1dbe + Update LibreSSL test 4.3.1->4.3.2. -commit ccc1faf67df795d5cd757df754703823d0874028 -Author: dtucker@openbsd.org -Date: Sat Feb 7 17:04:22 2026 +0000 +commit 684d26a3c4d07e78027517fd6e98875ae5dff71d +Author: djm@openbsd.org +Date: Mon Jun 1 05:49:20 2026 +0000 - upstream: Move ssherr.h to where portable needs it. + upstream: sk-usbhid: skip unsupported key types in read_rks() - (ID sync only) + When enumerating resident keys, encountering a credential with an + unsupported COSE key type (not ES256 or EdDSA) caused the entire + enumeration to abort via goto out, discarding all valid keys. - OpenBSD-Commit-ID: 0488ce85f24864186678dcac7c9973ca44bd2cd5 - -commit 6decbb90413c67c10ac2fd5b17a9c161196641ea -Author: Darren Tucker -Date: Sun Feb 8 04:30:40 2026 +1100 - - Move paths.h and poll.h includes to resync with upstream. - -commit 4fe79e3deb5457af588ab67ee5db642afedd935f -Author: Darren Tucker -Date: Sun Feb 8 04:28:28 2026 +1100 - - Move poll.h include to resync with upstream. - -commit 9e585f11bb71115fb0376b2b6118892ab600aa4f -Author: Darren Tucker -Date: Sun Feb 8 04:25:42 2026 +1100 - - Resync minor format diffs with upstream. - -commit 3fd88caa36a94d85ae66bff297142606d08decde -Author: Darren Tucker -Date: Sun Feb 8 03:56:15 2026 +1100 - - Resync headers with upstream. - -commit 77e41d0c1c8801c553b43eef5974268425395667 -Author: Darren Tucker -Date: Sun Feb 8 03:52:31 2026 +1100 - - Resync with upstream (unused header and whitespace). - -commit a393759f9693a08a7fba18d4824b74f2dda1fe3d -Author: Artem Savkov -Date: Tue Nov 18 16:26:11 2025 +0100 - - Fix ut_type for btmp records + Move the key type check before the per-credential allocation so + unsupported types can be skipped with continue instead. This + preserves all valid resident keys on the token. - According to man utmp ut_type is supposed to be only switched from - LOGIN_PROCESS to USER_PROCESS after succesfull authentication and this - is how sshd behaved before 671c44078. + Patch from Akhilesh Arora via GHPR657 - Fixes: 671c44078 ("use construct_utmp to construct btmp records") - Signed-off-by: Artem Savkov + OpenBSD-Commit-ID: b344a44ff97d26faf099b8e0cad72ad1e793ac0f -commit 15fe1ceb29760d72398c6ac7df5a403416cba207 +commit de24573efc60ca145e4f2d7e45787eccf8bd41a4 Author: djm@openbsd.org -Date: Sat Feb 7 02:02:00 2026 +0000 +Date: Mon Jun 1 05:40:13 2026 +0000 - upstream: bit of webauthn support missed in previous commit + upstream: Actually set pollfd.events correctly for socket type - OpenBSD-Commit-ID: 9768454543ded01b7c61567fc5b3e78664346be2 - -commit 670f7d210ceae59db73b16b67e52d8fd8def3012 -Author: dtucker@openbsd.org -Date: Fri Feb 6 23:39:14 2026 +0000 - - upstream: Adjust Makefiles to include just-added + channels; previously we were throwing away the events we computed if the + channel had a c->sock distinct from it's other read and write fds. + Fortunately, it appears that this case happens rarely, if ever. - ssherr_libcrypto where necessary. + Reported by Darafei Praliaskouski via GHPR660 - OpenBSD-Regress-ID: 53d179a2db3ab931f2aa0e5447cf20cb9787a8bb + OpenBSD-Commit-ID: d3f483b7919946c5649e8c697d5b927af35aac4b -commit 9c4949c11d8da1a5422e2174afb1a4f5b3dc8914 -Author: dtucker@openbsd.org -Date: Fri Feb 6 23:31:29 2026 +0000 +commit 58b9381e0b1dbc8e56190b26fb61bae4cfb240be +Author: djm@openbsd.org +Date: Sun May 31 13:12:07 2026 +0000 - upstream: Fetch the error reason from libcrypto - - if available, append it to the corresponding ssh error message and - optionall print the libcrypto full error stack (at debug1). with & - ok tb@ djm@ millert@ schwarze@ + upstream: handle compiled-time unsupported options in servconf.h - Note that the quality of errors obtainable from libcrypto is somewhat - variable, so these may be any of: useful, misleading, incomplete - or missing entirely. As a result we reserve the right to change - what is returned or even stop returning it if it does more harm than - good. + better; leave a zero placeholder variable so we don't have #ifdef around + their absence elsehwere in the tree - OpenBSD-Commit-ID: 1ad599ac3eeddbe254fec6b9c1cf658fa70d572e + OpenBSD-Commit-ID: 9601de2c67042aacb0ea12ca424e67c092fa7801 -commit 5b12d836e7c42c146ac1a69a9600db05282dbbb8 -Author: THE-Spellchecker -Date: Sat Jan 3 22:11:39 2026 -0600 +commit ea91c7a1a9ccb22bacd8fcff824c84e3b8414af5 +Author: Damien Miller +Date: Sun May 31 22:03:56 2026 +1000 - Typographical Fixes + depend -commit 11600929832e04aa6ad20a57af7187c3feb973d4 -Author: dtucker@openbsd.org -Date: Fri Feb 6 22:59:18 2026 +0000 +commit 3bc4ac43943852b214a3d85e3424d9304c8a736d +Author: djm@openbsd.org +Date: Sun May 31 11:39:44 2026 +0000 - upstream: Typo fixes, mostly in comments. + upstream: unit test for new servconf.[ch] code, including a basic - From THE-Spellchecker via github PR#620. + fuzz test for deserialisation - OpenBSD-Commit-ID: 64929fafa3caae5a162f23257917ecf33f8a3764 - -commit b83c0bb5109eb245dd4f06e4af4a960f96a0c193 -Author: Darren Tucker -Date: Sat Feb 7 06:58:59 2026 +1100 - - Enable gss-auth tests on Kerberos test configs. - -commit d84dbccee4371ce395d28543f146e7b62d8c0d36 -Author: Pavol Žáčik -Date: Thu Jan 29 11:01:19 2026 +0100 - - Add a GSSAPI authentication test - -commit 86e0f4aa2c72d5e96618f0c7214109f5a46ca70d -Author: Darren Tucker -Date: Thu Jan 1 21:41:10 2026 +1100 - - Split sudo out to its own install line. + OpenBSD-Regress-ID: f182c21485dc37a41a125f067b59bee48adbfe6c -commit dfbb8526b5006cfe368193fb15e16f58cce6e1d1 -Author: Darren Tucker -Date: Wed Dec 31 16:35:29 2025 +1100 - - Remove obsolete comments. - -commit f0b7ecf7f5976c11f8c89ee9b0ca19383b573764 -Author: Darren Tucker -Date: Wed Dec 31 16:26:23 2025 +1100 - - Run tests on older OmniOS version too. - -commit 01bddc0663e5239df9342fcf7b373e5f58ff1b49 -Author: Darren Tucker -Date: Wed Dec 31 16:25:16 2025 +1100 - - Add OpenIndiana VM test target. - -commit 91c4d422cc0af2ae592f5e6c0cc505a5d8d7a6d2 +commit f2b815e42d9fd654cb457cd7e7d1cb751f1a5a33 Author: djm@openbsd.org -Date: Fri Feb 6 01:24:36 2026 +0000 +Date: Sun May 31 11:31:57 2026 +0000 - upstream: remove vestige of when we supported running without privsep + upstream: the new configuration dump code emits configuration + + directives with capitalisation (previously they were all lowercase), so make + the tests that consume them insensitive to case - OpenBSD-Commit-ID: 5342c24d2330ef5ce357c294056f72b8123122c0 + OpenBSD-Regress-ID: 9a81d8501b8b8fc1c1a0d268d4cc91cbb19668f5 -commit 6463960c58cd0adcb26bfbddceb9d4efcfbd9dd0 +commit 633a4c1a24605e48c46fe76afc0814d20593fc00 Author: djm@openbsd.org -Date: Thu Feb 5 22:05:49 2026 +0000 +Date: Sun May 31 04:20:58 2026 +0000 - upstream: Implement missing pieces of FIDO/webauthn signature support, + upstream: flesh out match_pattern() tests, including a new - mostly related to certificate handling and enable acceptance of this - signature format by default. bz3748 GHPR624 GHPR625 + comparison test of the new NFA-based implementation against the original one + for all possible combinations of short inputs and patterns constructed from a + small dictionary of possibilities. - Feedback tb / James Zhang; ok tb - - OpenBSD-Commit-ID: ce3327b508086b24a3f7a6507aa5c49d8e9505e6 + OpenBSD-Regress-ID: a18e86c95afb6243ac270468f5dd0ab4a78c8074 -commit 832a77000abe61f61bddb9e595f45c7131c0269d +commit bebc855fdb3f8c7f96fd392f67bec2134cc42b1b Author: djm@openbsd.org -Date: Tue Jan 27 06:48:29 2026 +0000 +Date: Sun May 31 11:30:50 2026 +0000 - upstream: Implement "query" extension from + upstream: big refactor of sshd config management code. - draft-ietf-sshm-ssh-agent + This generates much of the initialisation, defaults and keyword table + code from a set of macros rather than hand coding them. These same + macros are also used to generate serialisation and deserialisation + code. - feedback jsg@, tb@; ok tb@ + The macros are admittedly ugly but have the advantage of forcing a + good degree of consistency across places that need to stay in sync + with each other. - OpenBSD-Commit-ID: adb2b79473ff86ba781ed5ab2735c1437b590f07 - -commit 409dc952ab88b5232e809e34fd55662c6f75ad81 -Author: millert@openbsd.org -Date: Thu Jan 22 15:30:07 2026 +0000 - - upstream: Make it clear that DenyUsers/DenyGroups overrides + The new de/serialisation code is used to pass configurations across + the various sshd-* process boundaries. This removes the need to pass + around raw text configurations that need to be re-parsed as well as + eliminating some raw pointer leakage across the processes where + structures were previously clumsily serialised. - AllowUsers/AllowGroups. Previously we specified the order in which the - directives are processed but it was ambiguous as to what happened if both - matched. OK djm@ + feedback/ok markus@ - OpenBSD-Commit-ID: 6ae0ab52ff796b78486b92a45cd7ec9310e20f4e + OpenBSD-Commit-ID: 9a5109a480637e08c290eeb82aa8ef2ca7e848ce -commit d7950aca8eacae8b889d92c669e913111af75984 +commit a1dd1c80687fbfbdca19d3a314a8176b90ae471b Author: djm@openbsd.org -Date: Wed Jan 21 23:58:20 2026 +0000 +Date: Sun May 31 06:14:42 2026 +0000 - upstream: In ssh(1), don't try to match certificates held in an - - agent to private keys. - - This matching is done to support certificates that were - loaded without their private key material, but is unnecessary for - agent-hosted certificate which always have private key material - loaded in the agent. Worse, this matching would mess up the - request sent to the agent in such a way as to break usage of these - keys when the key usage was restricted in the agent. + upstream: avoid strlen(NULL) crash if an X11 channel was created before - Patch from Thibault Cools via bz3752, ok dtucker@ + the x11-req SSH_MSG_CHANNEL_REQUEST was sent. Reported by Ben Perry via + GHPR679 - OpenBSD-Commit-ID: ebfe37817dad4841c53339930565242ec683d726 + OpenBSD-Commit-ID: 31db0da9ab6c73e6bbf4021ffd53dc3ce5c65f23 -commit b0d0b71651b5a19d0dbd27b623ebb4fc43145560 -Author: sthen@openbsd.org -Date: Wed Jan 21 15:44:51 2026 +0000 +commit df18979e1137f41a3ffa25f9d06c4fc55073cb34 +Author: djm@openbsd.org +Date: Sun May 31 05:55:21 2026 +0000 - upstream: If editline has been switched to vi mode (i.e. via "bind + upstream: DNS0x20[1] can randomise the case of domain names returned by - -v" in .editrc), setup a keybinding so that command mode can be entered. Diff - originally from Walter Alejandro Iglesias with tweaks. Feedback from Crystal - Kolipe. ok djm + lookup to force some more uniqueness in queries to reduce the likelihood of + spoofing attacks succeeding. - OpenBSD-Commit-ID: 5786e17ccd83573e2d86418023f9bc768223336a - -commit 1cc936b2fabffeac7fff14ca1070d7d7a317ab7b -Author: dtucker@openbsd.org -Date: Tue Jan 20 22:56:11 2026 +0000 - - upstream: Fill entropy in a single operation instead of hundreds. + Normally this should be hidden from the user by the resolver, but + in some cases it can leak through. When it does, it can mess up + ssh's CanonicalizePermittedCNAMEs. - The sntrup761 code we use from SUPERCOP fills entropy arrays 4 bytes at - a time. On some platforms each of these operations has a significant - overhead, so instead fill it in a single operation and as a precaution - zero that array after it's used. + Fix this by forcing the name we received from the system resolver to + lowercase. - Analysis and code change is from Mike Frysinger via Github PR#621 with - feedback from djm@ and sed-ification from me. ok djm@ beck@. + bz3966, report and fix by Martin D Kealey - This change was submitted by Mike to SUPERCOP upstream so hopefully - future versions will already have it. + [1] https://datatracker.ietf.org/doc/html/draft-vixie-dnsext-dns0x20-00 - OpenBSD-Commit-ID: 0e85c82f79b1b396facac59e05b288c08048f15c + OpenBSD-Commit-ID: e0b300d3b3af289e053d928380af71949f95bfb0 -commit a6f8f793d427a831be1b350741faa4f34066d55f +commit 5a5e47740b6466d58242aca28b9e584bab4ccf1d Author: djm@openbsd.org -Date: Sun Jan 4 09:52:58 2026 +0000 +Date: Sun May 31 04:59:51 2026 +0000 - upstream: rewrite SOCKS4/4A/5 parsing code to use sshbuf functions + upstream: disallow use of the copy-data extension to read and write - instead of manual pointer fiddling. Should make the code safer and easier to - read. feedback/ok markus@ + to the same inode simultaneously; reported by Qifan Zhang of Palo Alto + Networks; ok markus@ - OpenBSD-Commit-ID: 5ebd841fbd78d8395774f002a19c1ddcf91ad047 + OpenBSD-Commit-ID: 94ceb85146d92dbc1289c55d308498d5f56f274a -commit ea367b4bbc3fd49f84683763723425adfdce35c0 +commit 073faa6beceea162eeeb7963c7352a6c851e507a Author: djm@openbsd.org -Date: Tue Dec 30 04:28:42 2025 +0000 +Date: Sun May 31 04:51:45 2026 +0000 - upstream: test the right thing, doofus + upstream: Fix two separate one-byte out-of-cound reads - OpenBSD-Commit-ID: 31b2ec6e0b3dbd08c60ba2d969dd687cd80c25fd - -commit 5f2bc9cb8625d1fd582e0e4b562200f9856f1f7d -Author: djm@openbsd.org -Date: Tue Dec 30 04:23:53 2025 +0000 - - upstream: avoid possible NULL deref if + 1) if a server sent an empty reply to a SSH2_FXP_REALPATH request + 2) if a batch command used the full 2048 byte buffer but ended in a + literal backslash character - ssh_packet_check_rekey_blocklimit() called before the encrypted transport is - brought up. + Both reported by Zhenpeng (Leo) Lin from depthfirst - OpenBSD-Commit-ID: fb998ccbe59865e33a8ab6a6577f254d39bdc72f - -commit b9c318777eb40db66fb92df87666c3642467d0e7 -Author: djm@openbsd.org -Date: Tue Dec 30 00:12:58 2025 +0000 - - upstream: unit tests for sshbuf_consume_upto_child() + ok markus@ - OpenBSD-Regress-ID: 13cbd0370ebca7c61c35346b3e0356517719a447 + OpenBSD-Commit-ID: d1ccc1f5a6eb109065ce8a552fea8e502381ce59 -commit dd49a87bf4e4a219978bf20f03e2a72041f57b2f +commit 8dfe7ed6e2fd988de08df508355a196b956b2753 Author: djm@openbsd.org -Date: Tue Dec 30 00:35:37 2025 +0000 +Date: Sun May 31 04:47:29 2026 +0000 - upstream: Remove bug compatibility for implementations that don't - - support rekeying. AFAIK this is only an ancient Sun SSH version. + upstream: DisableForwarding=yes didn't override PermitTunnel=yes - If such an implementation tries to interoperate with OpenSSH, it - will eventually fail when the transport needs rekeying. + Reported independently by Huzaifa Sidhpurwala of Redhat and Marko + Jevtic; ok markus@ - This is probably long enough to use it to download a modern SSH - implementation that lacks this problem :) - - ok markus@ deraadt@ - - OpenBSD-Commit-ID: 228a502fee808cf8b7caee23169eb6a1ab1c331a + OpenBSD-Commit-ID: b5c13f0746cf079b21f8deba47407fad49ccbf4c -commit ca313fef2deed90668fe0706da8529310092d1dd +commit 72b05ecd141b9683285dcdb439de01903c1a07d3 Author: djm@openbsd.org -Date: Tue Dec 30 00:22:58 2025 +0000 +Date: Sun May 31 04:44:38 2026 +0000 - upstream: Enforce maximum packet/block limit during - - pre-authentication phase - - OpenSSH doesn't support rekeying before authentication completes to - minimise pre-auth attack surface. + upstream: make the transport protocol stricter by disconnecting if - Given LoginGraceTime, MaxAuthTries and strict KEX, it would be - difficult to send enough data or packets before authentication - completes to reach a point where rekeying is required, but we'd - prefer it to be completely impossible. + the peer sends non-KEX messages during a key re-exchange. - So this applies the default volume/packet rekeying limits to the - pre-auth phase. If these limits are exceeded the connection will - simply be closed. + Previously an evil peer could continue sending non-KEX messages + without penalty, causing memory to be wasted up until the + connection terminated or the server/client hit a OOM limit. - ok dtucker markus + reported by Marko Jevtic; ok markus@ - OpenBSD-Commit-ID: 70415098db739058006e4ebd1630b6bae8cc8bf6 + OpenBSD-Commit-ID: 8937f0f2096156f5c68ae2dce77956373589d757 -commit 55b6b1697433eca98052f5c45281133ca793a9c8 +commit 26cde4cfc55eb1d336e1249d702c0c4705b0424b Author: djm@openbsd.org -Date: Mon Dec 29 23:52:09 2025 +0000 +Date: Sun May 31 04:37:56 2026 +0000 - upstream: Add sshbuf_consume_upto_child(), to similify particular + upstream: stricter validation of the transport state passed from - parsing patterns using parent/child buffer; ok markus@ + the unprivileged preauth sshd-auth process to the user-privileged postauth + sshd-session process. - OpenBSD-Commit-ID: c11ed27907751f2a16c1283313e77f88617e4852 - -commit 6eafc52a4185ba6d765047146cd645152baaeb58 -Author: Ludovic Rousseau -Date: Sat Dec 27 10:07:22 2025 +0100 - - Update ssh-agent.1 + These are harmless unless an attacker had an exploit for sshd-auth + in which case they could be used for post-auth memory DoS or to + crash you own session in a new and exciting way. - Add a missing "/" in the default allowed providers list. - -commit 09daf2ac5f248dc5d60a6f3a703b479d67da14b4 -Author: djm@openbsd.org -Date: Mon Dec 22 03:36:43 2025 +0000 - - upstream: correctly quote wildcard host certificate principal name, + Reported by bylee3 and Kayky Vinicius - lest it expand to an unrelated filename in the working directory + ok markus - OpenBSD-Regress-ID: 8a9eb716d3ea7986d26c1a931758b996aa93c58e + OpenBSD-Commit-ID: 214e256904a4ae4f83d2083096796c9689c1d7b5 -commit dfd710e4e2928201743e32027e2d6cf0e2eafc61 +commit 10f66b2af950c94af3b25027abec5209d90eb451 Author: djm@openbsd.org -Date: Mon Dec 22 03:12:05 2025 +0000 +Date: Sun May 31 04:31:04 2026 +0000 - upstream: return 0 in void function; spotted by clang -Wextra + upstream: Enforce a maximum size for usernames in agent key use - OpenBSD-Commit-ID: fe7461c93dfaef98a007a246af837a8275a1e539 - -commit ecdf9b9f8e89aae65d4a12fe5a25c560eea08393 -Author: djm@openbsd.org -Date: Mon Dec 22 01:50:46 2025 +0000 - - upstream: regression tests for certificates with empty principals + constraints - sections (which are now unconditionally refused) and for certificates with - wildcard principals (which should only be accepted in host certs) + Along with the match_pattern() performance change that was just + committed this avoids a denial-of-service where an agent client could + waste CPU on an agent by sending user constraints with lots of + wildcards. - OpenBSD-Regress-ID: fdca88845a68424060547b4f9f32f90a7cf82e73 - -commit adca2f439827eb829652805f36e288b5b260ce1b -Author: djm@openbsd.org -Date: Mon Dec 22 01:31:07 2025 +0000 - - upstream: don't try to test webauthn signatures. Nothing in OpenSSH + Reported by Huzaifa Sidhpurwala of Redhat - generates these (yet) + ok markus - OpenBSD-Regress-ID: 48d59b7c4768c2a22ce3d8cf3b455e6ada9fc7b0 + OpenBSD-Commit-ID: 0483817f1a8accf4dbff42b7073ee4d119105d71 -commit 5166b6cbf2b6103117a79f90a68068e89e02bf66 +commit 1e82d2cfcfd05ec2e4515894a92223f40839c7b8 Author: djm@openbsd.org -Date: Mon Dec 22 01:49:03 2025 +0000 +Date: Sun May 31 04:24:39 2026 +0000 - upstream: When certificate support was added to OpenSSH, - - certificates were originally specified to represent any principal if the - principals list was empty. - - This was, in retrospect, a mistake as it created a fail-open - situation if a CA could be convinced to accidentally sign a - certificate with no principals. This actually happened in a 3rd- - party CA product (CVE-2024-7594). - - Somewhat fortunately, the main pathway for using certificates in - sshd (TrustedUserCAKeys) never supported empty-principals - certificates, so the blast radius of such mistakes was - substantially reduced. + upstream: fix client use-after-free on error path if cipher_init() - This change removes this footcannon and requires all certificates - include principals sections. It also fixes interpretation of - wildcard principals, and properly enables them for host - certificates only. + fails; reported by Qualys Security Advisory Team, ok markus@ - This is a behaviour change that will permanently break uses of - certificates with empty principals sections. - - ok markus@ - - OpenBSD-Commit-ID: 0a901f03c567c100724a492cf91e02939904712e + OpenBSD-Commit-ID: a8731da0c462b2b9d11314ba505c26ee0cdada83 -commit aaac8c61c18124eb5fb8a2cff1e85dea2db6c147 +commit 9d4c0b31f172782def72ccc2fb2dc217d3135e6f Author: djm@openbsd.org -Date: Mon Dec 22 01:20:39 2025 +0000 +Date: Sun May 31 04:19:16 2026 +0000 - upstream: Don't misuse the sftp limits extension's open-handles + upstream: Replace the old recursive match_pattern() with an - field. This value is supposed to be the number of handles a server will allow - to be opened and not a number of outstanding read/write requests that can be - sent during an upload/download. + implementation that uses a NFA for matching. This avoids the exponential + worst- case behaviour for the old implementation. ok markus@ - OpenBSD-Commit-ID: 14ebb6690acbd488e748ce8ce3302bd7e1e8a5b0 + OpenBSD-Commit-ID: fc6b75a52f4c0acb52b7900658c8d25ff873cbae -commit daf6bdd34b59f640d2af0fd230da69f1cbad33b4 -Author: djm@openbsd.org -Date: Mon Dec 22 01:17:31 2025 +0000 +commit 7ab700f1706b154d4bc5cf66e19c05be6d9b1fc1 +Author: Damien Miller +Date: Sat May 30 23:24:01 2026 +1000 - upstream: add a "ssh -O channels user@host" multiplexing command to + Make failure to set SECCOMP or NO_NEW_PRIVS fatal - get a running mux process to show information about what channels are - currently open; ok dtucker@ markus@ + If your Linux system lacks support for these then please don't + enable the seccomp sandbox. - OpenBSD-Commit-ID: 80bb3953b306a50839f9a4bc5679faebc32e5bb8 + Prompted by manfred.kaiser@ssh-mitm.at -commit b652322cdc5e94f059b37a8fb87e44ccb1cdff33 -Author: djm@openbsd.org -Date: Fri Dec 19 01:27:19 2025 +0000 +commit 4f4aeee6edaa248f1e7ce22ee3f35ce183eabf38 +Author: Manfred Kaiser +Date: Sun May 24 09:53:42 2026 +0200 - upstream: typo in comment + sandbox-seccomp-filter: remove duplicate SC_ALLOW(__NR_clock_gettime64) - OpenBSD-Commit-ID: f72306b86953e74f358096db141b4f9c00d33ed7 + The syscall is already permitted at line 297 in its own ifdef guard. + No functional change. -commit 0b98be75dbb2ccb1c3146429c0077416c113b57d -Author: djm@openbsd.org -Date: Fri Dec 19 01:26:39 2025 +0000 +commit 16908221360a01b1801c6ca70c26b73c83509ea3 +Author: deraadt@openbsd.org +Date: Wed May 27 13:57:26 2026 +0000 - upstream: correctly check subsystem command is not the empty string + upstream: Use the new RELINK feature in bsd.prog.mk to build the - (was repeatedly checking the subsystem name) spotted by Coverity (CID 898836) + relink kits. - OpenBSD-Commit-ID: dabea2b499de8280f76f7291dd52086df6831cb0 + OpenBSD-Commit-ID: df5c950444e208b320265fa8a1afd676e2edfa6e -commit 345892ba2e8efea4be03675c866395bee251c117 -Author: djm@openbsd.org -Date: Fri Dec 19 00:57:42 2025 +0000 +commit 3bee4a1a260809992a0877d7ef202c4ff3e0be24 +Author: tb@openbsd.org +Date: Wed May 27 13:54:15 2026 +0000 - upstream: regression test for bz3906: sshd crashing at connection + upstream: ssh: use sentinel idiom for timegm(3) and mktime(3) + + There is nothing wrong with times before the epoch, even -1, so use the + idiom recently added to the CAVEATS section to figure out whether there + was an error in the timegm() or mktime() calls. - time if the config lacks a subsystem directive but one is defined in a match - block. + We should sweep the tree for this. If anyone is bored, feel free to beat + me to it... - OpenBSD-Regress-ID: 5290553665307ccddaec2499ec1eb196bb2efc84 + ok deraadt djm + + OpenBSD-Commit-ID: e2b1721966dc782e776db5d6cfb18958534f9d4b -commit 81e5bb8d93f2d8361bd7f4b034044ad8ee4ded0e -Author: djm@openbsd.org -Date: Fri Dec 19 00:48:47 2025 +0000 +commit 26a8c13e6154a905b4eaf48798b134372747e86f +Author: tb@openbsd.org +Date: Wed May 27 03:28:07 2026 +0000 - upstream: check that invalid subsystem directives inside Match + upstream: ssh-agent: add -V to usage() - blocks are noticed at startup; bz#3906 + ok djm - OpenBSD-Regress-ID: b9171bde4cc24757a826b3da0e9eadc33995a453 + OpenBSD-Commit-ID: ea9bc250ce34c4c8317896673ca37f3ee17223c7 -commit 831e6db69ff8625b6e81c2809aa082abbab6c0b1 +commit 3a05a07e78f7b88ba70fa7f96808bcb86a55cbe8 Author: djm@openbsd.org -Date: Fri Dec 19 00:56:34 2025 +0000 +Date: Wed May 27 03:05:21 2026 +0000 - upstream: don't crash at connection time if the main sshd_config + upstream: use "ssh-agent -V" to test the binary is functional after - lacks any subsystem directive but one is defined in a Match block + relinking requested deraadt@ - bz#3906; ok dtucker - - OpenBSD-Commit-ID: 2eb9024726d6f10eaa41958faeca9c9ba5ca7d8a + OpenBSD-Commit-ID: eb4169949bf61188fb7336b11b73833019d10d7b -commit 4e0f2dee54d210dc44f72f73e703c6dc5348a406 +commit 7fbe3e440eae0cd2315545ce5abd89e936b3a92f Author: djm@openbsd.org -Date: Fri Dec 19 00:48:04 2025 +0000 +Date: Wed May 27 03:04:30 2026 +0000 - upstream: detect invalid sshd_config Subsystem directives inside - - Match blocks at startup rather than failing later at runtime; + upstream: add a -V flag to print the version, but mostly as a way - noticed via bz#3906; ok dtucker + to check the binary is functional; ok deraadt@ - OpenBSD-Commit-ID: e6035ff0baa375de6c9f22c883ed530a8649dfed + OpenBSD-Commit-ID: 0cc5cb22cbfe09ac4c316dd5da0af7a4193a42af -commit 4c9de155ce1d35c9e3c05223cc093580f9efff9a -Author: jsg@openbsd.org -Date: Thu Dec 18 23:54:10 2025 +0000 +commit f44f124a234785b9d2cd59a6da28737fb3c4ad9a +Author: dtucker@openbsd.org +Date: Wed May 27 23:04:36 2026 +0000 - upstream: new sentence, new line + upstream: Test all mutually supported algorithms, - OpenBSD-Commit-ID: 23974d7c98b2ba4fea7f5143676c34e04ffd4128 - -commit 3ab346aa6d9030379df3ec1ed0b0ce608f952c5f -Author: jsg@openbsd.org -Date: Thu Dec 18 23:51:56 2025 +0000 - - upstream: fix markup, .CM -> .Cm + using dropbear's new -Q option to query its algorithms where possible. - OpenBSD-Commit-ID: 4db8cb254792df8a4dce11825852e089ae3d053a - -commit 6e486d27c1af765a5c2975dd375667b38de35a4d -Merge: a880fbf02 f878d7ccc -Author: Chris Rapier -Date: Thu Dec 18 13:18:11 2025 -0500 - - Merge 12/18/2025 from openssh-master/master + OpenBSD-Regress-ID: 7e1fa733dec3bfa9f8931e535a9397209b5953f3 -commit f878d7ccc25b02a39e6766f5dd405d5de6fb106c +commit 0cadf7e0e88f4088595afbea21f2e43f3ae28abc Author: dtucker@openbsd.org -Date: Tue Dec 16 08:36:43 2025 +0000 +Date: Tue May 12 13:02:40 2026 +0000 - upstream: Plug leak in ssh_digest_memory on error path. + upstream: Dropbear recently added a -Q option; - Bonehead mistake spotted by otto@, ok djm@ + use it to query KEX if available. - OpenBSD-Commit-ID: 4ad67ac402e0b4c013f4f4e386d22b88969a5dd7 + OpenBSD-Regress-ID: beab781f357e27e75dfdd2ec600a7dff2c63cb5b -commit 49480f1934f8cf994afa646d4bcbd22ac08bb6af +commit 0e2db7bc017d968ef57b0b5b4fd86643ecdb05e4 Author: dtucker@openbsd.org -Date: Tue Dec 16 08:32:50 2025 +0000 +Date: Mon May 4 10:57:24 2026 +0000 - upstream: Add 'invaliduser' penalty to PerSourcePenalties, which is + upstream: Fix skip message. - applied to login attempts for usernames that do not match real accounts. - Defaults to 5s to match 'authfail' but allows administrators to block such - sources for longer if desired. with & ok djm@ - - OpenBSD-Commit-ID: bb62797bcf2adceb96f608ce86d0bb042aff5834 + OpenBSD-Regress-ID: d192bbc19cc5914e64a3bb35a347eca0318729af -commit 94bf1154b4132727114f222a587daeac101f1f5b -Author: djm@openbsd.org -Date: Mon Dec 8 03:55:22 2025 +0000 +commit 0a561f90672b6dc6187763f3b90e47c4c4247875 +Author: Darren Tucker +Date: Tue May 26 10:48:19 2026 +1000 - upstream: add a GssDelegateCreds option for the server, controlling - - whether it accepts delgated credentials offered by the client. This option - mirrors GssDelegateCreds in ssh_config. + Run hardenedmalloc test on ubuntu-latest. - From Dmitry Belyavskiy via GHPR614; ok dtucker@ - - OpenBSD-Commit-ID: ac419354edb26cef9ad15692e0bed17a03997786 + Needed for newer clang that supports -std=c23. -commit 24f32f7755801b16368375b8e27fb1a48d250fc5 -Author: djm@openbsd.org -Date: Mon Dec 8 00:45:00 2025 +0000 +commit 3468ac72962970728a204e5052a3be9826090b13 +Author: Darren Tucker +Date: Tue May 26 09:33:51 2026 +1000 - upstream: errant line - - OpenBSD-Commit-ID: 8542d59f5ba48a67c3ebd5de17f9fa408ec54ca5 + Hardenedmalloc needs -std=c23 so build with clang. -commit a1e37f0998ed5027f6c8dd30befb379ea2cac95b -Author: djm@openbsd.org -Date: Mon Dec 8 00:44:16 2025 +0000 +commit 42b213c66ba143f543b824ea5951f1ceb3fdd15b +Author: Michael Forney +Date: Fri May 22 03:02:00 2026 +1000 - upstream: There is a warning next to the authorized_keys command="" + Fix IPTOS_DSCP_VA fallback - flag that forcing a command doesn't automatically disable forwarding. Add one - next to the sshd_config(5) ForceCommand directive too. + 0x2c is the unshifted value, and was copied over from openbsd before + it was fixed to be 0xb0 in [0]. - feedback deraadt@ + Source of discrepancy identified by Leah Neukirchen. - OpenBSD-Commit-ID: bfe38b4d3cfbadbb8bafe38bc256f5a17a0ee75c + [0] https://cvsweb.openbsd.org/log/src/sys/netinet/ip.h#rev1.22 -commit 70ad2e9a2b3aa6f856200464078c2750bfba0e3d -Author: djm@openbsd.org -Date: Mon Dec 8 00:41:46 2025 +0000 +commit 66847768ffd5a2a004891c8d3bd79eaba12625b7 +Author: Darren Tucker +Date: Thu May 21 18:39:54 2026 +1000 - upstream: increment correct variable when counting group - - memberships. Reported by Kevin Day via bz3903 - - OpenBSD-Commit-ID: 772b9aafd5165a7c407f08cb95f8b94cc5a4c1c0 + Add OpenBSD 7.9 test VM. -commit d05b704086d53c02f4ad7de921435f7e7e3ad60a +commit d0d7981cf56363e6320f2aa6cf798e293420a7cf Author: Darren Tucker -Date: Sun Dec 7 20:10:42 2025 +1100 +Date: Thu May 21 18:38:47 2026 +1000 - Add OpenBSD 7.8 VM test target. + Another shell portability fix for Solaris. -commit f086fafa0486012df6ba095664be75ecbf68e8e1 +commit 498372545f48effd30a4d4c005eea25b1141fc74 Author: Darren Tucker -Date: Sun Dec 7 13:43:02 2025 +1100 +Date: Thu May 21 18:25:50 2026 +1000 - Remove generated compat includes during distclean. + Use backticks for shell portability w/ Solaris. -commit 185459dd87c4f7580a2591fbbbb1d800ec249b78 +commit 18b9db789e278c4d6a5ff21093a45683950db3ae Author: Darren Tucker -Date: Sun Dec 7 14:17:20 2025 +1100 +Date: Tue May 19 18:37:26 2026 +1000 - Define IPTOS_DSCP_VA if not already defined. + Add interop tests against Dropbear >= 2020.79 -commit f701869185915b9a324dcc23c12d0035251ef93f -Author: phessler@openbsd.org -Date: Fri Dec 5 17:48:47 2025 +0000 +commit a5a1b7e75389231bf817433d93f15732ba13c0ad +Author: djm@openbsd.org +Date: Thu May 21 04:04:57 2026 +0000 - upstream: allow network programs select DSCP_VA for network ToS + upstream: mention that compression could potentially leak - OK stsp@ + information about session contents (cf. the CRIME attack on TLS) if a + connection allows attacker- controlled traffic over it alongside trused + traffic. This might occur in some forwarding scenarios. - OpenBSD-Commit-ID: 8019fd6e8c522b4b5f291a2c0e3bf2437cc70dc1 + with deraadt@ + + OpenBSD-Commit-ID: 03d145cdbf3a8713e8309724b5c9a9b76c317749 -commit f62868e03e51785c521c4d20d60662c0bbdd695e -Author: dtucker@openbsd.org -Date: Sun Dec 7 02:59:53 2025 +0000 +commit e5c9cf9ac7543a5e59dabf11f993a9c032b9b71f +Author: djm@openbsd.org +Date: Thu May 21 02:50:59 2026 +0000 - upstream: Avoid "if ! thing || ! otherthing; then" constructs since + upstream: mention usefulness of request type allow/denylisting for - they seem to cause portability problems. + servers accepting untrusted clients - OpenBSD-Regress-ID: ff001be683de43bf396cd5f9f6a54e0c7a99c3cf + OpenBSD-Commit-ID: 8b991bd263b46374a8e73f02d05cdccca73ae520 -commit 45aca67d79c194660342a64a9175d814d4e8ba56 -Author: dtucker@openbsd.org -Date: Sun Dec 7 02:49:41 2025 +0000 +commit 62fce76130485773c635da8adaeb7de78382a5f0 +Author: tb@openbsd.org +Date: Mon May 18 04:14:57 2026 +0000 - upstream: spaces->tab + upstream: chacha: avoid -Wunterminated-string-initialization - OpenBSD-Regress-ID: c78eb430da0ec2c4b6919ff4d27ef8e565ef52ff - -commit ab164f671609a3a25cd0efcd967aff29144081bb -Author: dtucker@openbsd.org -Date: Sat Dec 6 07:10:24 2025 +0000 - - upstream: Append a newline, otherwise some sed's won't output anything. + warning + + The sizes of sigma[] and tau[] aren't used, so include a trailing NUL and + thereby avoid upsetting modern compilers about use of dangerous, valid C. + + ok deraadt djm - OpenBSD-Regress-ID: 507cb8c36bb7fc338f60a55bf7040f479536b3f7 + OpenBSD-Commit-ID: 030a71ff16bb1e6135170c6507bc558eabe7345c -commit c99a30d30a5d2af6fec30b9b0d85aa9b252760c9 -Author: dtucker@openbsd.org -Date: Sat Dec 6 03:23:27 2025 +0000 +commit 33392024f46e7aabaeaf947cc3b110d60a9fd9e3 +Author: djm@openbsd.org +Date: Wed May 13 05:58:58 2026 +0000 - upstream: Don't check compressions stats when ssh does not support + upstream: avoid validating bad cipher or mac lists in config files + + / commandline arguments as valid. + + Identified by SUSE and reported by Camila Camargo de Matos - compression. + ok deraadt@ tb@ - OpenBSD-Regress-ID: 026db51b2654a949e9a10b908443dab83b64c74a + OpenBSD-Commit-ID: 45d51154f2418549e08b80fa33df6c6532046054 -commit 5f5d1af478d4b9daf61fab1e4298973980d4c348 +commit cf6c0b3b94cdc223f1b8be1ef2d93e993af5d976 Author: djm@openbsd.org -Date: Fri Dec 5 11:13:35 2025 +0000 +Date: Wed May 13 05:11:02 2026 +0000 - upstream: ASSERT_DOUBLE_* test helpers + upstream: fix hard-to-reach NULL deref during pubkey auth - OpenBSD-Regress-ID: cdb5c4e95c0f00efb773ddba4056a49e33702cf9 + To hit this, the user must be using a PEM style private key with no + corresponding .pub key adjacent to it. + + OpenBSD-Commit-ID: b7150acc5322fa33f21491834d9471fbe3d30f20 -commit 70a01a7e66075047329e3aeccc942678f512ebdd +commit 55df196e39cb23fd53e42b2f07292ffc01650bff Author: Darren Tucker -Date: Fri Dec 5 20:02:39 2025 +1100 +Date: Tue May 12 19:53:54 2026 +1000 - Set SSH_REGRESS_TMP after making tmpdir. + Retire OmniOS r151046 & r151054 test configs. - Put both of these later in the script so the cvsids don't cause - conflicts on every synced patch. + They require packages from an external mirror which has been unreliable + lately, so stop relying on it. -commit 89a67a04e581423cdc443f2597cb1e2c7d8cc50f -Author: dtucker@openbsd.org -Date: Fri Dec 5 08:09:34 2025 +0000 +commit 6d9116d4dfefe387e42250ec7c01aad56ce43bda +Author: Darren Tucker +Date: Tue May 12 19:43:48 2026 +1000 - upstream: Shell compatibility fix. + Handle missing packages for FreeBSD 12.4. - OpenBSD-Regress-ID: bceaeb267d49c13e4a797c42e93b8f0cdb14dbd7 + (Most) FreeBSD mirrors no longer have packages for 12.x, so install the + only thing we need (sudo) from source on. -commit f4e79a4ba91cf0fd7397846424d1b261f3648708 -Author: djm@openbsd.org -Date: Fri Dec 5 07:43:24 2025 +0000 +commit 99f1e0c2f91f00e0bb3c4a814ec448fda2b0e144 +Author: Darren Tucker +Date: Tue May 12 18:50:20 2026 +1000 - upstream: unit tests for convtime_double() - - OpenBSD-Regress-ID: d3ba7b894019b4128845d638c78fca37b3b6eecf + OmniOS: check for gcc before installing. -commit c48de35bea389308428cb47b5ee55b1b1fb4567c -Author: djm@openbsd.org -Date: Fri Dec 5 07:49:45 2025 +0000 +commit ded80eb0ff89f18ccf25cd3dc7997d92d755ef6a +Author: Darren Tucker +Date: Tue May 12 18:05:24 2026 +1000 - upstream: convert PerSourcePenalties to using floating point time, + Add VM test versions for : OmniOS and FreeBSD. - allowing penalties to be less than a second. This is useful if you need to - penalise things you expect to occur at >=1 QPS. - - feedback dtucker / deraadt; ok deraadt@ - - OpenBSD-Commit-ID: 89198be755722131b45a52d22d548e4c602201f0 + Add OmniOS r151056 and r151058 (with build-essentials, so hopefully + faster and lower dependency) and FreeBSD 12.4 for better coverage. -commit f45cd249e45a15c84bf1316ac719039d04a74e84 -Author: djm@openbsd.org -Date: Fri Dec 5 07:43:12 2025 +0000 +commit 67f31cefd8ccf0f55f24e806c4dc86b028fa65ff +Author: Damien Miller +Date: Tue May 12 14:36:27 2026 +1000 - upstream: Add convtime_double() that converts a string interval, + update getrrsetbyname.c from OpenBSD upstream - such as "3w2d4h5m10.5s", into a floating point number of seconds. + revision 1.15 + date: 2026/05/09 01:54:51; author: tb; state: Exp; lines: +14 -13; commitid: zZPVUWycKAslGJtO; + Avoid recursive cleanup in getrrsetbyname() - Reimplement the existing convtime() function using convtime_double() - (it just drops the fractional seconds) + Instead of freeing struct dns_query and struct dns_rr by walking the + linked lists recursively, use a simple loop. This avoids a possible + stack exhaustion unlikely to be reachable with the limits modern + resolvers impose. - lots of feedback deraadt@ / dtucker@; ok deraadt@ - - OpenBSD-Commit-ID: 053cdd0c72325a20efc6613caa847473fb89e36f + From Dhiraj Mishra -commit b7dc1d95ee838c86a93df59663dad32e9b555520 -Author: dtucker@openbsd.org -Date: Fri Dec 5 06:55:22 2025 +0000 +commit 56e73cd804cff08e38caaa03b75bec253f16fd62 +Author: Darafei Praliaskouski +Date: Sat May 9 19:50:31 2026 +0400 - upstream: Add test for ssh -Oconninfo mux command. - - OpenBSD-Regress-ID: e939edc41caad8b6ad00ff294f33b61ed32a1edd + ci: avoid rsync dependency in NetBSD VM jobs -commit eb97fc2b5e7c85a37fdb3f8a6ee1d665ef086c3f -Author: dtucker@openbsd.org -Date: Fri Dec 5 06:16:27 2025 +0000 +commit ac4a41265a3beccba7dc6f45c657298311280f01 +Author: djm@openbsd.org +Date: Tue May 5 06:21:14 2026 +0000 - upstream: Add an ssh -Oconninfo command - - that shows connection information, similar to the ~I escapechar. - This is the first use of the mux extension mechanism, so it should be - both forward and backward compatible: a new client talking to an old - server will not allow the "conninfo" request to be sent, but everything - else should work seamlessly. feedback and ok djm@ + upstream: unbreak; spotted by Darren's test army - OpenBSD-Commit-ID: 50f047a85da277360558cabdfed59cb66f754341 + OpenBSD-Commit-ID: e95ceda842a2c7a08fc00ac3a529877d87fee7b2 -commit 66622394fd3a51e9a6c99c39a068f8ba709542fa +commit 3754f2edd42039ace7d53873975870fbe9143b94 Author: djm@openbsd.org -Date: Wed Dec 3 06:29:50 2025 +0000 +Date: Tue May 5 05:34:27 2026 +0000 - upstream: correctly quote filenames in verbose output for local->local + upstream: classify dynamic-tcpip channels as bulk, not interactive; - copies; from Colin Watson via bz3900; ok dtucker@ + bz3958, ok markus@ - OpenBSD-Commit-ID: 5c09b030e2024651ebc8c1f9af6a8a2d37912150 + OpenBSD-Commit-ID: b18f1c1eaff8423bf069ff6103e8865cec18d64b -commit 8fce5520a1c9c2cf3fc6c6974dd158f4b3ce9c4e -Author: dtucker@openbsd.org -Date: Sat Nov 29 06:49:56 2025 +0000 +commit 4ea08a0353f85b5b0cc1ddd70da5fa23e7d588a4 +Author: Darren Tucker +Date: Mon May 4 23:33:57 2026 +1000 - upstream: Add local hostname and pid to ~I escape connection info, + Improve NetBSD PAM tests. - only display peer information for TCP connections including source address - and port This provides enough information to uniquely identify a connection - on the host or network. - - OpenBSD-Commit-ID: aa18a4af2de41c298d1195d2566808585f8ce964 + - Set random password and use for password auth test. + - When testing PAM builds, test with and without UsePAM. -commit 2e8b5de4a79fb393482465531be1e347b81699f3 -Author: dtucker@openbsd.org -Date: Sat Nov 29 05:00:50 2025 +0000 +commit 504d01d81fe0d17725786b05737db9cd7f3b2b5c +Author: Darren Tucker +Date: Mon May 4 23:15:05 2026 +1000 - upstream: Add compression stats to ~I connection info escape - - option. + Improve FreeBSD PAM tests. - OpenBSD-Commit-ID: 83424b71fc226ea6b3dc8dda39f993475fdbd775 + - Set random password and use for password auth test. + - When testing PAM builds, test with and without UsePAM. -commit 52037ed910a9dcb669b9c9f612ccac711ac586f2 -Author: dtucker@openbsd.org -Date: Thu Nov 27 02:18:48 2025 +0000 +commit a05de3f67f69582e061445d5d78e5fcd01067299 +Author: Darren Tucker +Date: Mon May 4 22:57:58 2026 +1000 - upstream: Add Escape option ~I that shows information about the current - - SSH connection. ok djm@, "I like/want" sthen@ florian@ - - OpenBSD-Commit-ID: 0483fc0188ec899077e4bc8e1e353f7dfa9f5c1d + Update to FreeBSD 14.4, add 15.0. -commit 0fb1f3c9955d78fb0959842202b9ecfc36e37486 -Author: djm@openbsd.org -Date: Tue Nov 25 01:14:33 2025 +0000 +commit 6296749fe19a14d11826dd04591ebb84c110e96b +Author: Darren Tucker +Date: Mon May 4 21:40:52 2026 +1000 - upstream: move mention of default MaxStartups (which uses the - - form. - - GHPR568 from Santiago Vila + Improve Solaris PAM tests. - OpenBSD-Commit-ID: 7e68771f3cad61ec67303607afb3b85639288b29 + - Set up and run tests with SUDO. + - Set random password to use for password & kbdint auth tests. + - Only run t-exec when re-testing with PAM, don't rerun unit tests. + - When testing PAM builds, test with and without UsePAM. -commit 2d0d26602f739b4a3ddde6c4dbc8f3ddab38ac0d -Author: djm@openbsd.org -Date: Tue Nov 25 01:08:35 2025 +0000 +commit f9d62eaa536cba92bcb42658ff5f72c287c47e49 +Author: Darren Tucker +Date: Mon May 4 21:39:01 2026 +1000 - upstream: Support writing ED25519 keys in PKCS8 format. GHPR570 from + Only run t-exec when re-testing with PAM. - Josh Brobst - - OpenBSD-Commit-ID: 4f36019a38074b2929335fbe9cb8d9801e3177af + There's no point rerunning unit tests. -commit c23122c5ea7348b7b6daa2982e53c201a5354007 -Author: djm@openbsd.org -Date: Tue Nov 25 00:57:04 2025 +0000 +commit 05af6553e9026df935163a12d14ff4d205465717 +Author: Darren Tucker +Date: Mon May 4 18:47:03 2026 +1000 - upstream: avoid leak of fingerprint on error path; from Lidong Yan via - - GHPR611 - - OpenBSD-Commit-ID: 253f6f7d729d8636da23ac9925b60b494e85a810 + Add Solaris 11.4-clang-19 test. -commit 6157e1c41071fb0f5621868c38861934284268b1 -Author: djm@openbsd.org -Date: Tue Nov 25 00:52:00 2025 +0000 +commit cb654c2ce7b0113a14aba979ffe9f7f5ad312013 +Author: Darren Tucker +Date: Mon May 4 17:41:37 2026 +1000 - upstream: don't set the PerSourceNetBlockSize IPv6 mask if sscanf - - didn't decode it. From Mingjie Shen via GHPR598 - - OpenBSD-Commit-ID: c722014e735cbd87adb2fa968ce4c47b43cf98b0 + Add RUN_ONLY_PLATFORM to run a subset of tests. -commit 1fdc3c61194819c16063dc430eeb84b81bf42dcf -Author: djm@openbsd.org -Date: Mon Nov 24 23:56:58 2025 +0000 +commit 328993c8991e5cde61f5abf1b87b26fa2537ae6c +Author: Damien Miller +Date: Mon May 4 16:05:34 2026 +1000 - upstream: give ssh-agent more time to start in tests; requested in + skip ("#if 0") strvisx and stravis - GHPR602 + we don't use the in OpenSSH and some compilers throw warnings + compiling them that break -Werror + +commit 5fa60ae0d2ed3fc441f54c9349afbd63b6301929 +Author: Darren Tucker +Date: Fri May 1 09:19:56 2026 +1000 + + Remove 9.9 and 10.0 branches from build status page. + +commit 7ab5e4073a508a342be49e2c238087b2de4e099f +Author: Renaud Allard +Date: Sat Mar 21 19:23:04 2026 +0100 + + vm.yml: fix solaris PAM tests - OpenBSD-Regress-ID: 7d771db2c1d4a422e83c3f632ba1e96f72a262b8 + Add missing SSHD_CONFOPTS="UsePam yes" to the solaris PAM test + step so it actually tests PAM functionality instead of re-running + the default tests with a PAM-enabled binary. -commit 5e7c3f33b2693b668ecfbac84b85f2c0c84410c2 +commit 1c553a16065a95284468cd79b1c4919929dfe3ac Author: djm@openbsd.org -Date: Mon Nov 24 23:54:15 2025 +0000 +Date: Wed Apr 29 22:22:10 2026 +0000 - upstream: When testing PKCS11, explicitly allow the module path in - - ssh-agent. - - Allows testing of PKCS11 modules outside system directories. + upstream: fiddle with mask after umask call and not before; avoids - From Morgan Jones via GHPR602 + fortify warnings on android. bz3954 - OpenBSD-Regress-ID: 548d6e0362a8d9f7d1cc01444b697a00811ff488 + OpenBSD-Commit-ID: 82224426b2ee989c68f305caa50aa3d3b4993a84 -commit 69965aefe3355488e0462291be13a233b8405091 +commit 1bfe4ce37c3c531150b33d1a9d4dae6234028076 Author: djm@openbsd.org -Date: Mon Nov 24 23:43:10 2025 +0000 +Date: Tue Apr 28 21:32:05 2026 +0000 - upstream: When loading FIDO2 resident keys, set the comment to the + upstream: unveil the actual listening socket path and its directory - FIDO application string. This matches the behaviour of ssh-keygen -K + so it can be cleaned up at exit. - From Arian van Putten via GHPR608 + Reported by / tested by David Krause, ok markus@ - OpenBSD-Commit-ID: 3fda54b44ed6a8a6f94cd3e39e69c1e672095712 + OpenBSD-Commit-ID: b45d740e9a63dec0fad436ed78f6912b39f0cd53 -commit 2238c48dc90dc56af1d86b298d2cb25fa0c7ef14 -Author: tb@openbsd.org -Date: Sun Nov 23 07:04:18 2025 +0000 +commit f24dc9e993de6f99d5dcb06ba3a401fe5792b2f4 +Author: job@openbsd.org +Date: Mon Apr 20 07:43:52 2026 +0000 - upstream: pkcs11_fetch_ecdsa_pubkey: use ASN1_STRING accessors - - In anticipation of davidben and beck making ASN1_STRING opaque in - OpenSSL 4 with the aim of enabling surgery to make the X509 data - structure less bad [1], we need to use dumb accessors to avoid build - breakage. Fortunately only in one spot. - - This is OpenSSL 1.1 API and available in all members of the fork family. + upstream: Clarify comment on what setting extended types for - ok beck djm + channels does - [1]: https://github.com/openssl/openssl/issues/29117 + OK djm@ - OpenBSD-Commit-ID: 0bcaf691d20624ef43f3515c983cd5aa69547d4f + OpenBSD-Commit-ID: fa035fb19b74571992fa3adca4396a4c572a7a8a -commit 643222df689c95efff9e9506b76de458f69dd9c7 +commit b9ccca0edfbd46b3114192956d9aaea3e7bc3c08 Author: Darren Tucker -Date: Fri Nov 21 14:28:20 2025 +1100 +Date: Wed Apr 29 09:14:31 2026 +1000 - Update OSSFuzz link to current bug tracker. + Add tracking for 10.3 branch. -commit 2efdfbb4d78b9bbb73f55af150e8f985d4fe4c0f +commit 6185d1e6f74fb7749ff0227dfe44b2c3a9dd0885 Author: Darren Tucker -Date: Fri Nov 21 14:21:07 2025 +1100 +Date: Tue Apr 28 09:09:57 2026 +1000 - Add VM CI and CIFuzz status badges. + Rename obsd arm64 snapshot VM for consistency. -commit 71e8779113965d60d91ba2d15cdeeb43ecf230a7 -Author: djm@openbsd.org -Date: Fri Nov 21 01:29:27 2025 +0000 +commit 2029eddf4d57c654d53cdac7a192511de3b386dd +Author: dtucker@openbsd.org +Date: Mon Apr 27 05:49:41 2026 +0000 - upstream: unit tests for sshbuf_get_nulterminated_string() + upstream: Use supported hostkeyalgorithms specifically in + + sshd_config instead of supported key types, which is almost but not + completely correct. - OpenBSD-Regress-ID: cb0af1e4d6dcc94e263942bc4dcf5f4466d1f086 + OpenBSD-Regress-ID: 43c3b348576900f3e710bff5d6a87f0e803c5b3d -commit dec6334aaf6f542f34a0aca27dc2f535e9161a67 -Author: djm@openbsd.org -Date: Fri Nov 21 01:29:06 2025 +0000 - - upstream: add a sshbuf_get_nulterminated_string() function to pull a - - \0- terminated string from a sshbuf. Intended to be used to improve parsing - of SOCKS headers for dynamic forwarding. - - ok deraadt; feedback Tim van der Molen - - OpenBSD-Commit-ID: cf93d6db4730f7518d5269c279e16b172b484b36 - -commit a8718c3fc52511e5237f1cbe10c210948c5616ea -Author: dtucker@openbsd.org -Date: Thu Nov 20 05:07:57 2025 +0000 - - upstream: Free opts in FAIL_TEST. It should always be NULL anyway so - - this is a no-op, but it should placate Coverity CID 405064. - - OpenBSD-Regress-ID: 06789754de0741f26432c668fad8b9881c14c153 - -commit d68d528fefeca1e331696296ef5db7c4db246f9a -Author: dtucker@openbsd.org -Date: Thu Nov 20 05:10:56 2025 +0000 - - upstream: Plug leaks while parsing Match blocks. Coverity CID - - 469304, ok djm@ - - OpenBSD-Commit-ID: f9b79b86879a953ad034e6b92a398265b251bea7 - -commit e3f1fbb427df898d70083b42caab72baaa715400 -Author: dtucker@openbsd.org -Date: Thu Nov 20 05:10:11 2025 +0000 - - upstream: Plug leaks while parsing Match blocks. Coverity CID - - 515634, ok miod@ djm@ - - OpenBSD-Commit-ID: c7932eddecd47e5122e945246a40c56ffa42a546 - -commit ccad76e9e1e4f06889ee023893cea98bc165858b -Author: Darren Tucker -Date: Tue Nov 18 20:14:44 2025 +1100 - - Pull in rev 1.17 for spelling fix. - - Prompted by github PR#609 from Edge-Seven. - -commit 58533bbdf7aa0548de8e2abd3cb2de0593fa9fdc -Author: jca@openbsd.org -Date: Mon Nov 17 12:59:29 2025 +0000 - - upstream: Export XDG_RUNTIME_DIR to child ssh sessions - - Currently setusercontext(LOGIN_SETALL) does create the directory in - /tmp/run/user, since LOGIN_SETXDGENV is part of LOGIN_SETALL, but the - env variable wasn't exported. - - ok djm@ - - OpenBSD-Commit-ID: 02b8433f72759b3a07b55cbc5a7cdb84391b0017 - -commit e4cc5ab0efd85f01c0e1ae46825ffc0c7a8f44ce -Author: djm@openbsd.org -Date: Mon Nov 17 05:24:42 2025 +0000 +commit ff254f67401fb27e6ae81a266f2d41d4c16bdbba +Author: claudio@openbsd.org +Date: Thu Apr 23 12:57:47 2026 +0000 - upstream: don't strnvis() log messages that are going to be logged + upstream: Drop -Winline from CDIAGFLAGS it breaks on sparc64 - by sshd-auth via its parent sshd-session process, as the parent will also run - them though strnvis(). + On sparc64 ssh/unittests/kex fails to build with: + usr.bin/ssh/libcrux_mlkem768_sha3.h:8196: warning: inlining failed + in call to 'libcrux_ml_kem_polynomial_ZERO_89_ea': + --param max-inline-insns-single limit reached - Prevents double-escaping of non-printing characters in some log - messages. bz3896 ok dtucker@ + OK djm@ (long time ago) reminded by tb@ - OpenBSD-Commit-ID: d78faad96a98af5269d66ddceee553cf7d396dfe + OpenBSD-Regress-ID: c32094e3436536474039a4aeefabdbf0bd826554 -commit bad220decb95d3b5cc6e30f843c4fc9d9b0b7a67 +commit 2be9cec2fc062ffa087db55d26203db8f1567661 Author: Darren Tucker -Date: Mon Nov 17 21:36:45 2025 +1100 - - Remove obsolete CVSID. - -commit 2fe6e406b496b54351dab923f9be95579d39d071 -Author: dtucker@openbsd.org -Date: Mon Nov 17 09:59:13 2025 +0000 - - upstream: Ensure both sides of the test are non-NULL instead of just - - either. Coverity CID 443285. - - OpenBSD-Regress-ID: aa90e57b1bc8efce9e50734a07a8ffec0680059a - -commit c03bd45cb03ec0ca23ac27388b3671bd63b76328 -Author: Chris Rapier -Date: Fri Nov 14 13:21:55 2025 -0500 - - Remove MacOS 13 from the CI tests. - - MacOS 13 is depreacted by GitHub and be removed 12/04/2025. - -commit a880fbf028be4dadf64d92277ded521f7d9fd5b3 -Merge: 1adf107fe e2b93e162 -Author: Chris Rapier -Date: Thu Nov 13 12:52:56 2025 -0500 +Date: Mon Apr 27 21:53:36 2026 +1000 - Trying this out to see if occasional merges from - openssh-master will make it easier to do code reviews. + Update OpenSSL tested versions. -commit e2b93e16232834c61c9dcff5b20e4c55a26b324d +commit b41203e500e067095ef64a8de8ca4417a6f39552 Author: Darren Tucker -Date: Thu Nov 13 23:30:48 2025 +1100 - - Move libcrypto init check into entropy.c. - - This prevents link errors with the openbsd-compat tests when the linker - tries to bring in all the logging bits. - -commit ec41739bd68d639b0847b366697706e7dab3498d -Author: Icenowy Zheng -Date: Fri Nov 7 14:27:35 2025 +0800 +Date: Mon Apr 27 21:16:56 2026 +1000 - seccomp sandbox: allow uname(3) - - The uname(3) syscall is utilized by zlib-ng on RISC-V to decide whether - the kernel handles VILL bit of V extension properly (by checking the - kernel version against 6.5). - - Allow it in the seccomp sandbox. - - Signed-off-by: Icenowy Zheng + Comment out new PAM valgrind test until debugged. -commit 90501bc30ca94fa5443e2b7e2072d5d454587ef8 +commit 4e0d1aea897d77d3b93e191eda58436e44a53818 Author: Darren Tucker -Date: Thu Nov 13 22:04:19 2025 +1100 - - Remove remaining OpenSSL_add_all_algorithms() calls. - - We already have OPENSSL_init_crypto() in the compat layer (now with a - check of its return code, prompted by tb@). Prompted by github PR#606 - from Dimitri John Ledkov. ok beck@ - -commit d9955e4571ec356ba4f2e99d01f7fa88f6e20a63 -Author: dtucker@openbsd.org -Date: Thu Nov 13 10:35:14 2025 +0000 - - upstream: Remove calls to OpenSSL_add_all_algorithms() - - and ERR_load_crypto_strings(). These are no-ops in LibreSSL, and in - Portable have been mostly replaced by a call to OPENSSL_init_crypto() - in the compat layer. ok tb@ - - OpenBSD-Commit-ID: 4c3e0af10fe276766054eda34428a37a5606d3ea - -commit 6aba7008e6451ae3f9298214b13b8eded5fd9ff0 -Author: djm@openbsd.org -Date: Thu Nov 13 05:13:06 2025 +0000 - - upstream: sync support for systems that lack __builtin_popcount() from - - portable - - unused on OpenBSD (nothing sets MISSING_BUILTIN_POPCOUNT), but it - makes syncing much easier. - - OpenBSD-Commit-ID: 496446300d82615b24f83eca886b8fabdbee445b +Date: Mon Apr 20 18:47:23 2026 +1000 -commit 84347d67ad2d5ee0db43f32bca91bacccecdb647 -Author: djm@openbsd.org -Date: Thu Nov 13 04:56:23 2025 +0000 - - upstream: update our ML-KEM implementation to upstream libcrux - - v0.0.4 - - tested/ok tb@ - - OpenBSD-Commit-ID: 525a62549efbf53492adcb2c57e4872cdbaeed62 - -commit c09eeba78ad622b988ab7f8d96e75b7edd434598 -Author: tb@openbsd.org -Date: Fri Nov 7 06:29:45 2025 +0000 - - upstream: sshkey_ec_validate_public: zap trailing blank I missed on - - review - - OpenBSD-Commit-ID: b296bd6056f33fd567ca0d5e9123dac1ec00f037 + Simplify Cygwin permissions setting. -commit 7cb3ea4dcc7d73b2fad6782a119901cfa2b022aa +commit 6c5235cb6692415e475fea4c0b69ee7ea0af8055 Author: Darren Tucker -Date: Thu Nov 13 10:23:45 2025 +1100 +Date: Mon Apr 20 18:45:37 2026 +1000 - Simplify git command to avoid yaml syntax error. + Reorder steps to change perms before displaying. -commit 08786bbe7eebff316efb0b4ccb882f93f33a16b8 +commit ba110a56a7180fef18e02dfaccad97cc510a558f Author: Darren Tucker -Date: Thu Nov 13 09:53:17 2025 +1100 - - Don't use OpenSSL's ed25519 if built without EC. - - Explicitly check for OPENSSL_NO_EC, since otherwise the test will link - but then fail at runtime. - -commit d12813314452173b1709f7fdbae74add84c0056f -Author: Damien Miller -Date: Fri Nov 7 15:49:55 2025 +1100 - - octal-escape the colon character - - Apparently these are YAML magic when followed by whitespace - -commit 5a104d81a2a916a6b9a42e28a7fa11bb781dfdf4 -Author: Damien Miller -Date: Fri Nov 7 15:44:18 2025 +1100 - - try single quotes instead of escaped quotes - -commit 48d8293956b9801b870a56782e19f29793ca04ba -Author: Damien Miller -Date: Fri Nov 7 15:42:57 2025 +1100 - - escape quotes in yaml - -commit 1f1d63e16b5ce67f6f2f1170ec7221f1e6bff530 -Author: djm@openbsd.org -Date: Fri Nov 7 04:33:52 2025 +0000 - - upstream: Escape SSH_AUTH_SOCK paths that are sent to the shell as - - setenv commands. - - Unbreaks ssh-agent for home directory paths that contain whitespace. - - Based on fix from Beat Bolli via bz3884; feedback/ok dtucker@ - - OpenBSD-Commit-ID: aaf06594e299940df8b4c4b9f0a1d14bef427e02 - -commit 5794f2a186ee8ea7db0002bf7470b817572aaef0 -Author: djm@openbsd.org -Date: Thu Nov 6 17:24:28 2025 +0000 - - upstream: sk-dummy.so needs sshlog() stub after ed25519-openssl.c - - change - - OpenBSD-Regress-ID: 50b7f49021b8085728d0544275e141fb1bf4a2b5 - -commit a1c526f29b47147046f77a0f74097008256396f6 -Author: djm@openbsd.org -Date: Thu Nov 6 01:33:26 2025 +0000 - - upstream: unit test for stringlist_append() and stringlist_free() - - OpenBSD-Regress-ID: a3a4dae538c831b3810f69abc34ad8504dc3c460 - -commit 9d8c686981834bc1dde09f5067ff925d8fc158f5 -Author: djm@openbsd.org -Date: Thu Nov 6 01:33:03 2025 +0000 - - upstream: link against ed25519-openssl.c instead of ed25519.c - - OpenBSD-Regress-ID: f789d46e99d2598929e3c2d00b45c47cc3102501 - -commit e57ef43c3ecb69aa237e2d88b793f18ee8a25817 -Author: anton@openbsd.org -Date: Sat Nov 1 05:39:25 2025 +0000 - - upstream: Cope with recent changes and don't link hash.c. - - OpenBSD-Regress-ID: 577ef2f36ee592528448e8c0f33499e2e3512054 - -commit 9bea081888fa659b964e6bfa41caca2b5def98c2 -Author: djm@openbsd.org -Date: Fri Nov 7 04:11:59 2025 +0000 - - upstream: Remove some unnecessary checks in - - sshkey_ec_validate_public() - MIME-Version: 1.0 - Content-Type: text/plain; charset=UTF-8 - Content-Transfer-Encoding: 8bit - - Checking nQ == infinity is not needed for cofactor 1 curves. - Checking x and y coordinates against order is not needed either. - - patch from Szilárd Pfeiffer, with further refinement by tb@ - ok tb@ - - OpenBSD-Commit-ID: ef985e2be7c64e215d064757d3fc65eb181e8ede - -commit 1399419f0b2d024bde968ffe769a3808611917e4 -Author: djm@openbsd.org -Date: Thu Nov 6 01:31:11 2025 +0000 - - upstream: move stringlist_append() and stringlist_free() to misc.c - - OpenBSD-Commit-ID: 7d047bbff6964b9abbc04e9b3e2e1b4cc1db0aea - -commit f2ff1d9c1687be313dd491fcd136c682ef51bea8 -Author: djm@openbsd.org -Date: Fri Oct 31 01:50:43 2025 +0000 - - upstream: cleanup file descriptors across PKCS#11 client/helper - - execution; ok markus - - OpenBSD-Commit-ID: 993628a5b361e30aa48bbb4c07667a280f3f23ab - -commit 1adf107fe8389ccc50570dd70001253782eff609 -Merge: d4efde7f4 6b4ca8949 -Author: Chris Rapier -Date: Wed Nov 5 15:22:56 2025 -0500 +Date: Mon Apr 20 22:46:17 2026 +1000 - Merge pull request #144 from lucasqueiroz23/patch-1 - - fix typos + Allow setting TEST_SSH_TRACE via Github. -commit 7e5d404cf73b6762715eec69b67cce2c4801f9e9 +commit 8751cd9c5cac7b358b5648df0510b3f53b95fc22 Author: Darren Tucker -Date: Sat Nov 1 08:34:15 2025 +1100 +Date: Mon Apr 20 22:55:48 2026 +1000 - Support using git for OpenBSD src tree tests. + Add tests for libressl-4.3.1. -commit d87e7f0bed66fc9f76fe4a2f43390fdc9a664132 +commit 1afbd7bd1fb71e8b1d06f99978d439aec59dddca Author: Darren Tucker -Date: Sat Nov 1 08:33:07 2025 +1100 - - Add OpenBSD 7.8 test target. - -commit 2425d7faf4154b32b5f836596023cf2432b81eaf -Author: Damien Miller -Date: Fri Oct 31 13:47:49 2025 +1100 - - check PAM user against previous user, not pw_name - - Avoids early fatal() if the user doesn't exist. - - Reported by Viswesh Narayanan; ok dtucker@ - -commit 7e2f89b0fb72141abbce098e2682ba8e090cabfc -Author: Damien Miller -Date: Fri Oct 31 12:19:47 2025 +1100 - - skip pkcs11 tests when built --without-openssl - -commit 590a260f0bedc895688bb38b1cf6f0f72d8013e3 -Author: Damien Miller -Date: Fri Oct 31 12:19:34 2025 +1100 - - add sshlog() replacement to sk-dummy.so - -commit 6b4ca89492bed80d8ac2d4886793ea7c54146ff1 -Author: Lucas Queiroz <86672557+lucasqueiroz23@users.noreply.github.com> -Date: Thu Oct 30 21:31:23 2025 -0300 - - fix typos - -commit 57e347bae04cf214795fdeae3579991f0cc2e090 -Author: Damien Miller -Date: Fri Oct 31 11:16:29 2025 +1100 - - rename openbsd-compat sha2.h -> bsd-sha2.h - - avoids confusion with system header when included from files under - openbsd-compat/ - -commit a5f638585152863dc64ee9436a08e1d84735d740 -Author: Damien Miller -Date: Fri Oct 31 11:07:17 2025 +1100 - - fix linking for sk-dummy.so, used in tests - -commit c2a178959b03472c1b1677fea4bb263ed9fee2bd -Author: djm@openbsd.org -Date: Thu Oct 30 23:55:09 2025 +0000 - - upstream: don't link hash.c - - OpenBSD-Regress-ID: a145f09c1efb1fcd3924544463f1f94f5d4805c0 - -commit 249224a0d43fdd2a536d7476c2bb15f4006dbbdd -Author: miod@openbsd.org -Date: Thu Oct 23 19:06:10 2025 +0000 - - upstream: Prepare for gcc 3 leaving the building, COMPILER_VERSION - - can no longer get set to "gcc3". - - OpenBSD-Regress-ID: 02351ea947975b80be60b9a8c6e4dbb57789e890 - -commit 9dcd640d44b8270c75783ef662c340187250d6e4 -Author: dtucker@openbsd.org -Date: Thu Oct 23 06:15:26 2025 +0000 - - upstream: Check tmux version and skip if too old. ok djm@ - - OpenBSD-Regress-ID: fb62024eb753c61b4d78402ec8378af839fad26c - -commit 94a78254a1c953c2a55eb54f65a5d99873b54bdf -Author: djm@openbsd.org -Date: Thu Oct 30 23:19:33 2025 +0000 - - upstream: move crypto_hash_sha512() to be inline in crypto_api.h, saves - - about 0.5kb per binary and makes life easier for portable; with/ok dtucker@ - - OpenBSD-Commit-ID: 672d7390f78bb6581c12661d7f5adc8a9c6be564 - -commit 266647c5f2075d397bd5ed5316450183eda73388 -Author: djm@openbsd.org -Date: Thu Oct 30 20:49:10 2025 +0000 - - upstream: support ed25519 signatures via libcrypto. Mostly by Jeremy - - Allison Feedback tb@, ok tb@ markus@ - - OpenBSD-Commit-ID: e8edf8adffd5975d05769dde897df882d7933526 - -commit 4f3e65bda22b65dc5fff82df1e97af07456fed42 -Author: djm@openbsd.org -Date: Thu Oct 30 03:19:54 2025 +0000 - - upstream: Activate UnusedConnectionTimeout only after last channel - - has closed. Previously UnusedConnectionTimeout could fire early after a - ChannelTimeout. - - This was not a problem for the OpenSSH client because it terminates - once all channels have closed but could cause problems for other - clients (e.g. API clients) that do things differently. - - bz3827; ok dtucker - - OpenBSD-Commit-ID: ff2e4607cbd4e600de3c8a5ece3b0e4bb641ed8f - -commit e7f5928ef1c8e8c725bdca9cdd6b80e77fe774ac -Author: miod@openbsd.org -Date: Thu Oct 23 19:06:10 2025 +0000 - - upstream: Prepare for gcc 3 leaving the building, COMPILER_VERSION - - can no longer get set to "gcc3". - - OpenBSD-Commit-ID: 98eefed432ff8253b307002e20d28da14b93e7e3 - -commit d4efde7f405f6bcfef0c7a227114c3ddd1e54f08 -Merge: 1f58137c7 8d12770e9 -Author: Chris Rapier -Date: Thu Oct 23 12:01:37 2025 -0400 +Date: Mon Apr 27 20:51:17 2026 +1000 - Merge pull request #141 from rapier1/dev_minor + Re-enable SHA1 sigs in OpenSSL on Cygwin for tests. - Dev minor + Recently Cygwin imported changes from Fedora which disable SHA1 + signatures by default. This breaks the unit tests (and a couple of + regression tests), so set rh-allow-sha1-signatures=yes in the OpenSSL + config to re-enable them. -commit 0ffb76c6590800958777cd0f7b1aaae19c74fa3f -Author: djm@openbsd.org -Date: Wed Oct 22 06:22:58 2025 +0000 +commit 7235471fb40705130d7f5816ec31ab562efc8cf9 +Author: Darren Tucker +Date: Sat Apr 25 20:00:38 2026 +1000 - upstream: more explicit synchronisation around killing tmux sessions + Check for OPENSSL_NO_ENGINE for --with-ssl-engine. - between runs. + OpenSSL 4 removes support for ENGINE, but it provides no-op stubs + for the ENGINE functions in addition to setting OPENSSL_NO_ENGINE. - OpenBSD-Regress-ID: 1735f5cb13ad281e869ab998c7d49b692ee3ed47 + The presence of the stubs fooled the old configure test, so if someone + tried --with-ssl-engine with OpenSSL 4.0.0 it'd try but fail at build + time. Explicitly check for OPENSSL_NO_ENGINE. before trying to enable + ENGINE support. bz#3952. -commit ffd086b69886e8cfeb74f9b2bcb18764bf7d9a52 +commit 45b30e0a5439a02417a4fe982a4b16a9c126ba6b Author: djm@openbsd.org -Date: Wed Oct 22 05:22:31 2025 +0000 +Date: Sun Apr 19 23:37:22 2026 +0000 - upstream: remove debugging junk + upstream: correctly set extended type for client-side channels. - OpenBSD-Regress-ID: 3247e0ac98ae4cfe4eede871ef424d166e29e828 - -commit 52712d5f11172ca98ffb0b2ac93007f74cb67134 -Author: djm@openbsd.org -Date: Tue Oct 21 23:30:01 2025 +0000 - - upstream: just skip the test if $PATH or $HOME has whitespace in it + Fixes interactive vs bulk IPQoS for client->server traffic. ok job@ - OpenBSD-Regress-ID: ccf75a29d1a300a35f63be0e4f11ad5276756275 + OpenBSD-Commit-ID: 34f5131face8d6dc4ae6955196e5fcafb3570cfe -commit a8eac05a85e31b11513a6a8dc5d662b14cbc2f4b -Author: djm@openbsd.org -Date: Tue Oct 21 22:13:27 2025 +0000 +commit ca19b95ab6cd4efe5f2d8a08a377a2ac0b9caca1 +Author: job@openbsd.org +Date: Mon Apr 13 08:18:33 2026 +0000 - upstream: quote paths; avoids test failure when run from a path with a + upstream: Also show the duration of the current session through the - space in it + ~I escape - OpenBSD-Regress-ID: e4b7bffc289f10d47c50c02dd70b0323078a83b4 - -commit 8d12770e9dcbe6e171340901a187dac310af587d -Author: Chris Rapier -Date: Tue Oct 21 12:31:35 2025 -0400 - - Added DynamicWindow branch to CI tests - -commit 9985e7ce0935de210248e9dc5f63de2ba64d995d -Author: Chris Rapier -Date: Tue Oct 21 12:23:14 2025 -0400 - - Turns out that I can just disable the workflows from github - -commit 11ac5cb8eedc5c831b8e77e55fa2ada87cf12021 -Author: Chris Rapier -Date: Tue Oct 21 12:03:20 2025 -0400 - - Trtying to streamline the CI testing - -commit 425e5b6bd765efbfc7691f43bfc08c86dc8a615e -Author: djm@openbsd.org -Date: Tue Oct 21 08:35:22 2025 +0000 - - upstream: fix test for executability of tmux + OK dtucker@ - OpenBSD-Regress-ID: a18119876ecfd95edb78225b086ac668eb0977ab + OpenBSD-Commit-ID: 695c1a09c4cc8b417a1bd3eb207b0cc7fa831c7a -commit d1d8144ea682adae5c3bb2994322fa524584ce8b +commit 00d955cf9e2e09eb3e98ebf6b375adccb7f25842 Author: djm@openbsd.org -Date: Tue Oct 21 08:34:52 2025 +0000 +Date: Tue Apr 7 07:40:40 2026 +0000 - upstream: add some more synchronisation to avoid a race between + upstream: want stdint.h here now that we've switched from u_intXX_t - command entry and ^C that showed up on the portable regress tests. + -> uintXX_t - OpenBSD-Regress-ID: 5527e74aed1b008aa7e5223ca5a84aedecd973d4 + OpenBSD-Commit-ID: 6d5e80bd6f29a9db18b18beeb1cbe5423b59de44 -commit 8704c141bf6ded67ab466f5e987c49329ebbd968 -Author: dtucker@openbsd.org -Date: Tue Oct 21 07:18:27 2025 +0000 - - upstream: Always create logfiles. Should prevent "can't operate on - - symlink" warnings during test runs. - - OpenBSD-Regress-ID: 65cf5ce3c8b87b5609f1f3ea142b4f381128dc33 - -commit dc9af8fb0436013afb544248e0afc2fd02a1a8fa -Author: Mike Frysinger -Date: Sun Oct 19 09:33:23 2025 -0400 - - bsd-openpty: include stdio.h for snprintf - -commit afe83537e0c0c159c7c3b6ef859424f6da18169c -Author: Damien Miller -Date: Tue Oct 21 09:14:35 2025 +1100 +commit eb34f95206c3556e10046f091ea95431c4be84f8 +Author: Bob Beck +Date: Thu Apr 16 10:09:02 2026 -0600 - include tmux in CI package list + Make ci work for OpenSSL 4 variants -commit a750ec60782d21db69383344dda478342d40ffa1 +commit 713ec5c5ae9b8ca91c3b752bec12e728612d13f4 Author: Darren Tucker -Date: Mon Oct 20 18:31:08 2025 +1100 - - Detect tmux at configure time and pass to tests. - - ok djm@ - -commit 75faa8a167b5cd4453937387b15216aa3cbc52ce -Author: Darren Tucker -Date: Mon Oct 20 18:29:24 2025 +1100 - - Update LibreSSL versions and add 4.2.0. - -commit 74369b2b7c366887211ef5c092b0aaa60f31ef11 -Author: djm@openbsd.org -Date: Mon Oct 20 00:45:10 2025 +0000 +Date: Thu Apr 16 20:55:23 2026 +1000 - upstream: regression test for "interactive" ssh with a PTY attached, - - using tmux - - would have likely caught the ControlPersist regression in 10.1. - - feedback nicm@ - - OpenBSD-Regress-ID: d4d709c08657769cb5691893cc98f34b6f537e76 + Test against OpenSSL 3.6.2, 4.0.0 and 4.0-stable. -commit a204650386124df8035b8c8613dccbe9b3158cdf -Author: Darren Tucker -Date: Fri Oct 17 16:26:22 2025 +1100 +commit b6d46558dbd482d0d9c46ab53805d1803967b59c +Author: Dmitry Misharov +Date: Mon Mar 16 09:08:57 2026 +0100 - Retire macos-13 runners, add Intel-specific ones. + account newer openssl versions in .github/setup_ci.sh -commit a6503f1e22aa34ac08d5b4d2b6730954ffd30116 +commit f2da6737e237324b43afc002ce4836e65659fb2e Author: Darren Tucker -Date: Fri Oct 17 16:23:43 2025 +1100 +Date: Thu Apr 16 19:32:34 2026 +1000 - If we have nfds_t, check if it's int or long. - - Should fix build on very old Mac OS X, eg 10.3. Spotted and patch tested - by Sevan Janiyan. + Match case with other messages. -commit ce49aceba9f4b5f34a1041145782914aa35ca880 +commit b433d015a6547598e568808d9cae16325bc8928f Author: Damien Miller -Date: Thu Oct 16 11:15:16 2025 +1100 - - link ssh against ssh-pkcs11.o - - Should fix PIN entry for direct use of PKCS11Provider in ssh(1) - bz3879 - -commit 946574b97ceae126e0f0af2db43abb454937defe -Author: djm@openbsd.org -Date: Thu Oct 16 00:01:54 2025 +0000 - - upstream: regress test for PKCS#11 directly in ssh (not via ssh-agent) - - would have caught bz3879 - - OpenBSD-Regress-ID: ceafb1e9a6c07185cc0cb0589f3170489a516123 - -commit e3fdb82fb02723dbe139f9d4be274d7fddfb7983 -Author: djm@openbsd.org -Date: Thu Oct 16 00:00:36 2025 +0000 - - upstream: missed a case in previous - - OpenBSD-Commit-ID: 271c5602b5e719ee3def19dbd9a33328b4fa7edc - -commit d926a84d17fb28bc94219e68575cb4847af02e9a -Author: djm@openbsd.org -Date: Wed Oct 15 23:55:01 2025 +0000 - - upstream: don't try to pledge() the client if a PKCS11Provider is - - in use - - OpenBSD-Commit-ID: 445b2bf4b1e36e515f4d888f35244fd2dcfbb566 - -commit 9c8572a357c071923569a62bd9cfb68b1f788e09 -Author: djm@openbsd.org -Date: Wed Oct 15 23:54:20 2025 +0000 +Date: Wed Apr 15 08:14:58 2026 +1000 - upstream: mention this is for both ssh-pkcs11.c and - - ssh-pkcs11-client.c - - OpenBSD-Commit-ID: 26eff4b9a328fa056e98b997cb57254639e48fda - -commit a4e404a64b117a15453075ee26eb061d416e58cd -Author: Arnout Engelen -Date: Sat Jun 21 09:47:28 2025 +0200 - - mdoc2man: process `Dl` macros - - `Dl` marks a single line as 'literal'. Since we don't output single - lines differently in literal vs regular mode (we only insert line - breaks for multi-line blocks in literal mode), we can just skip it. - -commit 45e2d8861bb724cfced1bf0693a6418a0cba6ab2 -Author: Arnout Engelen -Date: Fri Jun 20 21:36:44 2025 +0200 - - mdoc2man: support `Ns` inside `Ic` - - When encountering an `Ns` mdoc macro ('no space') inside an `Ic` block - ('command'), such as for 'lines=number' in ssh-keygen.1, `mdoc2man` - just output the macro instead of processing it. + regen signature on allowed_signers file - This adds processing for `Ns` when seen inside an `Ic` block. - -commit 2b1761dea36c120417d8b73db8310dc09a781e6f -Author: Mike Frysinger -Date: Mon Oct 13 11:29:36 2025 -0400 - - gitignore: ignore all *~ files - - This is a common backup style. - -commit 3ccdd9841f48e7d660f8b60c996965e9dde0a3a9 -Author: Mike Frysinger -Date: Mon Oct 13 12:49:24 2025 -0400 - - bsd-misc: include sys/ioctl.h - - This file uses ioctl() to implement some fallback functions, but - doesn't include sys/ioctl.h for it. - -commit 3adc47e161901001816045c032fa61e94b0c9426 -Author: Damien Miller -Date: Tue Oct 14 14:52:50 2025 +1100 - - don't leak PAM handle on repeat invocations - - Reported by Casper Dik via bz3882; ok dtucker@ - -commit 21826c5acf588daae0c1be5d4efc39aef54fcb67 -Author: Chris Rapier -Date: Mon Oct 13 17:03:25 2025 -0400 - - Updated version to 18.8.0 - -commit 270aabacdcafd85e83ed62063433f2eba99819fa -Author: Chris Rapier -Date: Mon Oct 13 17:00:49 2025 -0400 - - Updated Changelog - -commit 71ba7c6d22532a08b12c1bbd7811df024768703d -Merge: 572046931 d01efaa1c -Author: Chris Rapier -Date: Mon Oct 13 16:56:56 2025 -0400 - - Merge of 10.1P2. - - No conflicts in the code. Only conflict is in the Changelog. - I'll force this commit and then rebuild the Changelog with - our log data. - -commit a6ee0eb8cd951d0a00b2f06687c77f8f573b5985 -Author: Darren Tucker -Date: Mon Oct 13 19:02:45 2025 +1100 - - Switch OpenBSD VMs to use doas instead of sudo. - - OpenBSD 7.3 packages have been removed from the mirrors so we can't - install sudo for it any more, so switch to the native doas utility. - -commit da2f945f62e5a462381103803ee72e924bd1f137 -Author: Damien Miller -Date: Mon Oct 13 14:33:04 2025 +1100 - - check whether diff accepts -N - -commit cd8c96f283dbad90991edc09ade962bcfd96adc9 -Author: djm@openbsd.org -Date: Mon Oct 13 00:56:15 2025 +0000 - - upstream: test remote/remote recursive transfers where the source - - path ends in ".." - - OpenBSD-Regress-ID: 2f42078cfcee986d08b5d135968b8de6186c0003 - -commit be0777ae3ef6d9deacb0e3c494674c84feac34bd -Author: djm@openbsd.org -Date: Mon Oct 13 00:55:45 2025 +0000 - - upstream: test recursive transfers, including cases where the - - source path ends in ".." - - OpenBSD-Regress-ID: a38e3dbc86f6b7a95605784dcc601f17ede9c3f0 - -commit 36a98fccaacbbf07eaf67855a8057cba724c5e91 -Author: djm@openbsd.org -Date: Mon Oct 13 00:55:09 2025 +0000 - - upstream: test implicit destination path selection when source path - - ends with ".." - - OpenBSD-Regress-ID: 42a88e7cdceee8a83879f5730199084ee4a95902 - -commit 4f14ca8633a2c8c0a1a19165663421f0ab32f6ab -Author: djm@openbsd.org -Date: Mon Oct 13 00:54:29 2025 +0000 - - upstream: similar to scp, fix implicit destination path selection - - when source path ends with ".."; ok deraadt@ - - OpenBSD-Commit-ID: 9b8d2a662d96b241293a88b3ea21f2419bfc4812 - -commit 6432b9f6a216d0f5fb43df500e9bc30bebb3f58b -Author: djm@openbsd.org -Date: Mon Oct 13 00:53:51 2025 +0000 - - upstream: when using the SFTP protocol for transfers, fix implicit - - destination path selection when source path ends with ".."; ok deraadt@ - bz3871 - - OpenBSD-Commit-ID: d75b3b006386c5302ed4f67c4add18464ab36a0b - -commit 30c20c901d8f665fb28edd006f6f8c1e46413051 -Author: dtucker@openbsd.org -Date: Sat Oct 11 23:39:14 2025 +0000 - - upstream: Import regenerate moduli. - - OpenBSD-Commit-ID: 8512e01cf917dca6455be561d66db8eeb49f3f0b - -commit b6fd0e6d085ef519982c968b57fbaa9e509e1a3a -Author: Damien Miller -Date: Fri Oct 10 15:23:59 2025 +1100 - - depend - -commit d01efaa1c9ed84fd9011201dbc3c7cb0a82bcee3 -Author: Damien Miller -Date: Fri Oct 10 13:38:31 2025 +1100 - - autogenerated files for release - -commit 2d8a388de215d9959d72bb11f03e07a6eb2e4614 -Author: Damien Miller -Date: Fri Oct 10 13:37:07 2025 +1100 - - depend - -commit d6212b0b89241e96d2fea9619b2d66ea668bceaa -Author: djm@openbsd.org -Date: Fri Oct 10 00:31:53 2025 +0000 - - upstream: clean up more thoroughly between tests - - OpenBSD-Regress-ID: c8394eae7547374a8fc43d03d865539e2917ea50 - -commit 9525aa3ecc6b27643fb83d8be4d61e831e357134 -Author: djm@openbsd.org -Date: Thu Oct 9 23:58:27 2025 +0000 - - upstream: simplify - - OpenBSD-Regress-ID: 8e91a2a5c1eb50128de3be72118b544d73a86673 - -commit e7b4b3f153713c15e3888aa50df039b2445492dd -Author: djm@openbsd.org -Date: Thu Oct 9 23:26:47 2025 +0000 - - upstream: don't abuse SSHKEY_FLAG_EXT to signal that a key is in - - the agent, as that triggers special handling on sshkey_free() - - OpenBSD-Commit-ID: 2ae2247babd2db167a30cf7a4f7eae4f26c000a8 - -commit 59a336cfd1283f512f067e01bc91bda5af253f80 -Author: djm@openbsd.org -Date: Thu Oct 9 23:25:23 2025 +0000 - - upstream: downgrade a useless error() -> debug() - - OpenBSD-Commit-ID: 5b0c9bcddb324f8bed2c8e8ffe9c92d263adc2d9 - -commit 649c9994e7d1995a03d8621f1412cfee90a430af -Author: djm@openbsd.org -Date: Thu Oct 9 03:23:33 2025 +0000 - - upstream: silence "mm_log_handler: write: Broken pipe" logspam - - OpenBSD-Commit-ID: bcf7c6ea509e755bd5a7cd567ff7cad725111a14 - -commit fb0bf236b0237aa83a0c5b666af7bdc0423ac457 -Author: Darren Tucker -Date: Thu Oct 9 17:57:17 2025 +1100 - - Add tracking for 10.2 branch. - -commit 1d2676f4ffae35e2db37a35c385efaf2932cd639 -Author: Damien Miller -Date: Thu Oct 9 14:53:04 2025 +1100 - - update versions - -commit ecd65a492bd0ed3a44a1c07428107b2e148bfee4 -Author: djm@openbsd.org -Date: Wed Oct 8 00:32:52 2025 +0000 - - upstream: openssh-10.2 - - The only change since 10.1 is the channels.c fix - - OpenBSD-Commit-ID: 5eebeb0db14c694efd4ee96b5f16112e3e5d5ba9 - -commit ea9af2921cb6af8e65341531db3a7351917f0a92 -Author: djm@openbsd.org -Date: Wed Oct 8 21:02:16 2025 +0000 - - upstream: fix crash at exit (visible via ssh-keygen -D) when - - multiple keys loaded. ok markus deraadt dtucker - - OpenBSD-Commit-ID: baa9763ec69d162108dafd962792ec5610ff45c9 - -commit e49013576074ccd2d7ae75fb824170c739ce97a1 -Author: Damien Miller -Date: Thu Oct 9 10:07:40 2025 +1100 - - link ssh-keygen directly against ssh-pkcs11.c - - Matches what OpenBSD does and fixes ssh-keygen regression in - certifying keys using a CA key hosted via ssh-agent (bz3877) - -commit 684f2ceff8c0eeb775e8653cf32609f8fbfe07b1 -Author: Damien Miller -Date: Thu Oct 9 13:10:27 2025 +1100 - - some fixes to p11_setup - - 1. Use the ssh-keygen under test and not the one in $PATH - 2. Include a test PKCS#11 operation to ensure that the P11 stack is - working correctly. - - Previously, it was possible for p11_setup to return success on - configurations with PKCS#11 support disabled. - -commit af17ae64a5cfee42334883d2802f40f779131740 -Author: Damien Miller -Date: Thu Oct 9 13:12:15 2025 +1100 - - complete PKCS#11 stubs and move to ssh-pkcs11.c - - Should unbreak --disable-pkcs11 builds - -commit 081b8dbbe90d81a43b5e0f1995fe59a0e319aa15 -Author: Damien Miller -Date: Thu Oct 9 13:12:15 2025 +1100 - - complete PKCS#11 stubs and move to ssh-pkcs11.c - - Should unbreak --disable-pkcs11 builds - -commit ac4457787900c99ada9cc3768249291b002fa16e -Author: Damien Miller -Date: Thu Oct 9 13:10:27 2025 +1100 - - some fixes to p11_setup - - 1. Use the ssh-keygen under test and not the one in $PATH - 2. Include a test PKCS#11 operation to ensure that the P11 stack is - working correctly. - - Previously, it was possible for p11_setup to return success on - configurations with PKCS#11 support disabled. - -commit 3470f465c6f5c7c371e73927ebb403dd7ba05893 -Author: Damien Miller -Date: Thu Oct 9 10:07:40 2025 +1100 - - link ssh-keygen directly against ssh-pkcs11.c - - Matches what OpenBSD does and fixes ssh-keygen regression in - certifying keys using a CA key hosted via ssh-agent (bz3877) - -commit 0f3b8fd68a29766697d7a709bae8b0a61da6cff2 -Author: djm@openbsd.org -Date: Wed Oct 8 21:48:40 2025 +0000 - - upstream: When tab-completing a filename, ensure that the completed - - string does not end up mid-way through a multibyte character, as this will - cause a fatal() later on. - - based on GHPR#587 from @TaoistBrickscarrier; feedback tb@ kevlo@ - ok dtucker@ - - OpenBSD-Commit-ID: efb977164b4e20d61204a66201a7592ba8291362 - -commit 0118c30acaff308deb089fc25fe98ef59a149ca5 -Author: djm@openbsd.org -Date: Wed Oct 8 21:02:16 2025 +0000 - - upstream: fix crash at exit (visible via ssh-keygen -D) when - - multiple keys loaded. ok markus deraadt dtucker - - OpenBSD-Commit-ID: baa9763ec69d162108dafd962792ec5610ff45c9 - -commit 64ea9e95256203f30f98a6896f4721fd223106aa -Author: djm@openbsd.org -Date: Wed Oct 8 00:32:52 2025 +0000 - - upstream: openssh-10.2 - - The only change since 10.1 is the channels.c fix - - OpenBSD-Commit-ID: 5eebeb0db14c694efd4ee96b5f16112e3e5d5ba9 - -commit bcf7c05a473f92a35f4f3b561fd7a1e339e0a30f -Author: Darren Tucker -Date: Wed Oct 8 11:26:52 2025 +1100 - - Fix header name and move return outside of ifdef. - - Fixes from Mike Frysinger via Github PR#597. - -commit b937061fe4922caced7b91442b3233c0bd763492 -Author: Darren Tucker -Date: Tue Oct 7 21:10:33 2025 +1100 - - Check HAVE_MMAP too now that configure sets it. - -commit 8d57083c062f03098c9f767ec8d6278dc549a2f6 -Author: Darren Tucker -Date: Tue Oct 7 21:07:05 2025 +1100 - - Use calloc for sshkeys if mmap is not supported. - - Based on Github PR#597 from Mike Frysinger, any bugs added by me. - -commit c97b931bffa481c72ff4bfddd9d59a2110899289 -Author: Darren Tucker -Date: Tue Oct 7 20:25:07 2025 +1100 - - Add fcntl.h to includes. - - From FreeBSD via bz#3874: "This was previously included due to nested - includes in Heimdal's headers. Without this, the build fails with an - error due to redefining AT_FDCWD." - -commit 8aa13832315e52c4404c993a59c6139b44ac6114 -Author: Daan De Meyer -Date: Mon Mar 20 20:22:14 2023 +0100 - - Only set PAM_RHOST if the remote host is not "UNKNOWN" - - When using sshd's -i option with stdio that is not a AF_INET/AF_INET6 - socket, auth_get_canonical_hostname() returns "UNKNOWN" which is then - set as the value of PAM_RHOST, causing pam to try to do a reverse DNS - query of "UNKNOWN", which times out multiple times, causing a - substantial slowdown when logging in. - - To fix this, let's only set PAM_RHOST if the hostname is not "UNKNOWN". - -commit 0bd6649ea80ead0cd6404dbc25b64937421b556e -Author: Darren Tucker -Date: Tue Oct 7 20:10:56 2025 +1100 - - Don't copy native host keys for hostbased test. - - Some github runners (notably macos-14) seem to have host keys where - public and private do not match, so generate our own keys for testing - purposes. - -commit 33b63718d40ccc555b8c7a24331a3790b2efc6c5 -Author: Darren Tucker -Date: Tue Oct 7 20:10:07 2025 +1100 - - Add 10.1 branch to ci-status page. - -commit 52411f15353257e9ec883fc044b7a56b6fca242d -Author: Darren Tucker -Date: Tue Oct 7 20:04:40 2025 +1100 - - Add clock_gettime compat shim. - - This fixes the build on macOS prior to 10.12 Sierra, since it does not - have it. Found and tested by Sevan Janiyan. - -commit beae06f56e0d0a66ca535896149d5fb0b2e8a1b4 -Author: djm@openbsd.org -Date: Tue Oct 7 08:02:32 2025 +0000 - - upstream: don't reuse c->isatty for signalling that the remote channel - - has a tty attached as this causes side effects, e.g. in channel_handle_rfd(). - bz3872 - - ok markus@ - - OpenBSD-Commit-ID: 4cd8a9f641498ca6089442e59bad0fd3dcbe85f8 - -commit 57204693181d7135afefc2db0ef3752d46818158 -Author: Chris Rapier -Date: Mon Oct 6 11:29:12 2025 -0400 - - Remove compiled man pages - -commit dbb7890ae499fbea08f7b4ec15dbf332911d4578 -Merge: 8cf3d17ec 1dfb2c1db -Author: Chris Rapier -Date: Mon Oct 6 11:28:52 2025 -0400 - - Final merge of 10.1p1 branch into HPN-SSH - -commit 1dfb2c1db06d7c5831a0315692f7e51f5ac03e2f -Author: Damien Miller -Date: Mon Oct 6 13:25:16 2025 +1100 - - autogenerated files for release - -commit 476bab6259d5a6ea0402ec79bc47ed61e2c15e86 -Author: Damien Miller -Date: Mon Oct 6 12:52:25 2025 +1100 - - depend - -commit af956575eba6bf6b6d6bc817e1aa6ed73a365984 -Author: Damien Miller -Date: Mon Oct 6 12:51:13 2025 +1100 - - update versions - -commit 2fd0945913a30fbbe7c02503347961df03f28e66 -Author: Damien Miller -Date: Mon Oct 6 12:48:16 2025 +1100 - - sync ssh-copy-id to upstream version 527be673f4d - -commit 981bb32bc6062fa5d6f11de7ffb732967463bf57 -Author: djm@openbsd.org -Date: Mon Oct 6 01:45:22 2025 +0000 - - upstream: openssh-10.1 - - OpenBSD-Commit-ID: 2a232c2d2fc05a23519f69bc29e6d8c076b97d97 - -commit b9a640a1a0dccfb56be684cc7ade402f57cf7ebd -Author: dtucker@openbsd.org -Date: Fri Oct 3 01:03:45 2025 +0000 - - upstream: If write() returned short, the subsequent write would restart - - from the beginning of the buffer not the end of what was written. Fix, since - we want modpipe to corrupt data for testing purposes deliberately not - accidentally. ok djm@ - - OpenBSD-Regress-ID: 50ca74d287445c58944f070bb92dc13b1d054b43 - -commit a0e5446ac85aca5a3ef9844eeedf787300fdb8b3 -Author: naddy@openbsd.org -Date: Sat Oct 4 21:41:35 2025 +0000 - - upstream: typos: a ssh* -> an ssh* - - ok dtucker@ - - OpenBSD-Commit-ID: a70fd2e1b23089260e8f5a7921b0debc06b011cb - -commit ade92f53c3bd4ad7dcd95334a194add57ec9ff71 -Author: djm@openbsd.org -Date: Fri Oct 3 00:09:26 2025 +0000 - - upstream: stray newline - - OpenBSD-Commit-ID: b47ed4fa93b781c7ec8ae2936526a290f4e17e1f - -commit a9cbe10da2be5be76755af0cea029db0f9c1f263 -Author: djm@openbsd.org -Date: Fri Oct 3 00:08:02 2025 +0000 - - upstream: include openssl/bn.h explicitly in files where we use BN_* - - makes things simpler for portable; from Mike Frysinger - - OpenBSD-Commit-ID: 717e93403fd1108e175afd7451b5a4ab46a598fe - -commit 8cf3d17ecc7a988c535648133f66392b26beb605 -Merge: 1bed65a80 3957cc291 -Author: Chris Rapier -Date: Thu Oct 2 14:07:17 2025 -0400 - - Merge remote-tracking branch 'openssh-master/master' into port_10.1_18.7.1 - -commit 3957cc2914cdc88932c972413853f8b68c1ffba5 -Author: dtucker@openbsd.org -Date: Thu Oct 2 08:38:43 2025 +0000 - - upstream: Relax array check slightly. Prevents compiler warnings - - in -portable when there are no kbdint devices present. ok djm@ - - OpenBSD-Commit-ID: c1c050cecd642d6073c792201908fd225191df93 - -commit 6a239b057be2897d7a597daaf5394f2e7312dc65 -Author: djm@openbsd.org -Date: Thu Oct 2 04:23:11 2025 +0000 - - upstream: backout r1.243 (fix for fatal during tab-completion with - - some multibyte sequences) as it breaks the common case for tab completion. - - Will deal with it properly after release. - - OpenBSD-Commit-ID: 196d00f5ff19579214de45357f16a1fb2d624be1 - -commit b9f6a84ea383d811216de38219472214963c10b2 -Author: Darren Tucker -Date: Thu Oct 2 10:48:04 2025 +1000 - - Pass COMPATINCLUDES down to openbsd-compat too. - - Fixes build on Solaris, AIX and probably others. - -commit 1bed65a8062045da543f10c68bcb934f2741e04d -Merge: 037e1857a 047e0221e -Author: Chris Rapier -Date: Wed Oct 1 14:35:47 2025 -0400 - - Merge of Oct 1 2025 OpenSSH Master - -commit 047e0221eaf9815775e8ea78c6d6add5ab0f68c7 -Author: Darren Tucker -Date: Wed Oct 1 14:34:02 2025 +1000 - - Pass new "compat includes" path via AC_SUBST. - - This fixes the build when the directory path containing a space. - Found by Sevan Janiyan, tested by Job Snijders. This doesn't fix - "make tests", however that is a different, pre-existing problem - that needs to be addressed separately. - -commit 5c50ddbe4deac83995edc1d014e9ba0d5efa18a6 -Author: Darren Tucker -Date: Wed Oct 1 13:37:35 2025 +1000 - - Remove compat "include" dir during distclean. - -commit aceabd62ce5833716dd2e99d4be4fcb603d263cc -Author: dtucker@openbsd.org -Date: Wed Oct 1 00:33:37 2025 +0000 - - upstream: Set keys to NULL after freeing in tests where the - - variables will be used again. Should prevent Coverity "potential use after - free" warnings. - - OpenBSD-Regress-ID: 24d141657d25977e41dfb0c58e9b74ab093972bf - -commit eb30a0d1493a97b5c14728846576dc6af5d442da -Author: dtucker@openbsd.org -Date: Wed Oct 1 00:30:19 2025 +0000 - - upstream: Get rid of utf8 droppings in commment since it confuses - - older shells. From Sevan Janiyan via openssh-unix-dev. - - OpenBSD-Regress-ID: 67c11a5cff6ef23538c77e9b29d538e175e6cfe3 - -commit d478e250230e917eeb5032238df0b9af357404ee -Author: Darren Tucker -Date: Wed Oct 1 12:17:54 2025 +1000 - - Update OpenSSL & LibreSSL versions we test against. - -commit 037e1857a4d9d27c19e39cdcd050c18ae820817b -Author: Chris Rapier -Date: Tue Sep 30 15:29:17 2025 -0400 - - Typos in readconf.c - -commit 9aaf2997f7cb13e8825df1b8f96122de14adebc0 -Merge: 1f58137c7 2c504a74e -Author: Chris Rapier -Date: Tue Sep 30 15:25:49 2025 -0400 - - Initial pass at porting 10.1 into 18.7.1 - -commit 1f58137c71178f08392cf710d7de0a6f37158409 -Merge: 27d8b7e9a 7d6d075ac -Author: Chris Rapier -Date: Tue Sep 30 11:44:23 2025 -0400 - - Merge pull request #137 from rapier1/dev_minor - - HPN-SSH 18.7.1 Release - -commit 2c504a74ed81d13c8198a89ed1040d0fc5f73129 -Author: djm@openbsd.org -Date: Tue Sep 30 00:10:42 2025 +0000 - - upstream: during sftp uploads, avoid a condition where a failed write - - could be ignored if a subsequent write succeeded. - - This is unlikely but technically possible because sftp servers are - allowed to reorder requests. - - Reported by Graziano Stefani, ok tb@ - - OpenBSD-Commit-ID: 03904bce2c7f787223d01d7e1179fde15753eca3 - -commit 1f7556753869654ba5e2bf61e384c5da2db5ca6a -Author: djm@openbsd.org -Date: Tue Sep 30 00:06:06 2025 +0000 - - upstream: avoid a fatal() when sftp tab-completes filenames that - - share common utf-8 characters that don't encode to a complete codepoint - - from menthu.zhou via GHPR#587; ok dtucker@ - - OpenBSD-Commit-ID: e07e4d8a8cac032ab536570b8214e6ef6839b585 - -commit 42b14ff1e06fd683c7d15a6b2816c16108873a5a -Author: djm@openbsd.org -Date: Tue Sep 30 00:03:09 2025 +0000 - - upstream: fix memory leak in mux_client_request_stdio_fwd GHPR#575 - - by Boris Tonofa; ok dtucker - - OpenBSD-Commit-ID: 410cdd05242304bd0196b9172ce5fcaf89d2d8ce - -commit e5055ef26abcffd3f99669e411ea6b35ca166111 -Author: Allison Karlitskaya -Date: Wed Sep 3 20:07:55 2025 +0200 - - Don't log audit messages with UNKNOWN hostname - - The `host` parameter to audit_log_acct_message() is documented as - follows: - - host - The hostname if known. If not available pass a NULL. - - but we pass the string "UNKNOWN" in case we don't know the hostname. - Make sure we pass NULL instead. - - This avoids having the audit system attempt to perform a DNS lookup on - the hostname "UNKNOWN", which tends to result in long delays when - attempting to login. - -commit d343df4019b4369ce7f87e9bf6bbc80b81cd263d -Author: zhangjun -Date: Fri Aug 22 16:49:07 2025 +0800 - - ensure struct passwd fields are non-NULL in pwcopy - - Android libc can return NULL pw_gecos, for example. - -commit 893a579e4b37e6bd89d206dc8e7ac2a906ccf114 -Author: dtucker@openbsd.org -Date: Mon Sep 29 21:37:52 2025 +0000 - - upstream: Add explicit check for array overflow. - - The array is bounded by a NULL sentinel which already prevents this, - however since we check the bit vector for overflow Coverity assumes that - check is for the devices array and flags it as a potential overflow. - Adding this additional check on the array placates CID 896018. ok djm@ - deraadt@ - - OpenBSD-Commit-ID: e92fff41341b38e4206a70655cc9acaaa032ebee - -commit 90f49a185ac1a786d9f7e9a710b369afb3692a65 -Author: dtucker@openbsd.org -Date: Mon Sep 29 21:30:15 2025 +0000 - - upstream: Move ifdef to start of file. Removes diff vs portable. - - OpenBSD-Commit-ID: 55058ac3d477e4c696575039f5b275522b99ffea - -commit 2f71b44d48dc8da7fb743d6ffe609aea5a645edb -Author: dtucker@openbsd.org -Date: Mon Sep 29 21:29:22 2025 +0000 - - upstream: Include misc.h. Removes diff vs portable. - - OpenBSD-Commit-ID: 8aa48451fe5c37f04a339450c4ed9cfb8f4c288f - -commit dfb991bdd826517bbce1cf62ce07bcb3e48a2f27 -Author: dtucker@openbsd.org -Date: Mon Sep 29 21:28:33 2025 +0000 - - upstream: Sort headers as per KNF. Removes diff vs portable. - - OpenBSD-Commit-ID: 55f5b9eaeb826a25cfb506a78136094275a71bcb - -commit c82f4dd6b723a8365b4c538d7c99fe8e46985ed0 -Author: dtucker@openbsd.org -Date: Mon Sep 29 07:40:55 2025 +0000 - - upstream: Null out keys after freeing in tests in the case where we - - potentially reuse the variable. Fixes Coverity CID 405057. - - OpenBSD-Regress-ID: c52e86502b33bfa6e448448a74a0217dd519dd58 - -commit 7d6d075ac1f1f8d64fcb4cb6f2836e44dd7480ee -Author: Chris Rapier -Date: Mon Sep 29 15:48:35 2025 -0400 - - Push portable release number to p2 to reflect openssh repo - -commit d9af599ae81161f77f1b4dc9f83fef4f850259f1 -Merge: b60b4bb7d 32e2da91c -Author: Chris Rapier -Date: Mon Sep 29 15:39:41 2025 -0400 - - Merge pull request #136 from rapier1/feature_increment_version - - Increment version number - -commit 32e2da91c35b5ab1345bdee1ce0fb0f492e3531d -Author: Chris Rapier -Date: Mon Sep 29 15:33:33 2025 -0400 - - Increment version number - -commit fda31e1e5179b4e70c27094ebb303ee47c11a5a7 -Author: djm@openbsd.org -Date: Mon Sep 29 03:17:54 2025 +0000 - - upstream: avoid spurious error message when loading certificates - - only bz3869 - - OpenBSD-Commit-ID: e7848fec50d15cc142fed946aa8f79abef3c5be7 - -commit bcd88ded2fff97652d4236405a3354ca66f90f7e -Author: djm@openbsd.org -Date: Mon Sep 29 02:32:15 2025 +0000 - - upstream: kbd-interactive device names should be matched against - - the full device name, not a prefix. Doesn't matter in practice as there is - only one kbd-int device supported (PAM xor BSD auth), and an attacker would - still need to successfully authenticate against an incorrectly-selected - device. - - reported by ashamedbit, NobleMathews; ok deraadt@ - - OpenBSD-Commit-ID: cf75d4f99405fbb41354c4ae724a3b39a3b58f82 - -commit b1c4bf5c2f1c2b30698dbaadc5d823862213f1fc -Author: jsg@openbsd.org -Date: Thu Sep 25 12:52:21 2025 +0000 - - upstream: avoid use-after-free in update_krl_from_file() found with - - clang scan-build, ok dtucker@ - - OpenBSD-Commit-ID: 8ec86eca573740c94d5bc7e252959174555f4eb8 - -commit b06a150bc903a0cf898406384d5a34059d0f2d8f -Author: Darren Tucker -Date: Sat Sep 27 20:20:34 2025 +1000 - - Stop testing OpenBSD ubsan until fixed upstream. - -commit 97b32fa2af25c16aec4de85c5cbb63fd038b4dfa -Author: dtucker@openbsd.org -Date: Fri Sep 26 04:40:45 2025 +0000 - - upstream: Use $OBJ for temp file in maxstartups idempotence test. - - Fixes test in -portable when run out-of-tree. - - OpenBSD-Regress-ID: 8578be08238af4abe2dc91af1c199f7f71f1a7a2 - -commit b4ceca952b85752958d849508294afdc56dfcb9f -Author: Darren Tucker -Date: Fri Sep 26 22:28:13 2025 +1000 - - Shorten workflow names to fit in a single line. - -commit 9824ec515ed6256c1a98d66049471053f965b75e -Author: Darren Tucker -Date: Fri Sep 26 22:26:33 2025 +1000 - - Update link to oss-fuzz bug tracker. - - Remove 9.8 branch. - -commit 37d996bd0537837f15fc540d5aebb1ef2faf2268 -Author: dtucker@openbsd.org -Date: Thu Sep 25 22:17:29 2025 +0000 - - upstream: Check return codes of sshbuf functions. - - Fixes Coverity CIDs 405059 and 405061. - - OpenBSD-Regress-ID: defa55d32892172251bbd5efd15731ce55888247 - -commit 6c3c9f03c3c2cc4e40decbb49b8486abfb9e57df -Author: Darren Tucker -Date: Fri Sep 26 08:23:21 2025 +1000 - - Replace hand-rolled modulo with arc4random_uniform. - - Fixes potential modulo-by-zero UB flagged by Coverity CID 405068 - -commit e914e61eb88e22e5b725c399698256c54589ca32 -Author: Darren Tucker -Date: Thu Sep 25 17:50:07 2025 +1000 - - Remove status bits from OpenSSL >=3 version check. - - OpenSSL traditionally did not guarantee ABI compatibility across release - (and development) versions. Because of this, OpenSSH checked the lower 4 - "status" bits returned by OpenSSL_version_num(), which were originally - set to 0 for development versions and 0xf for release versions and, if - they did not match, would report the discrepancy and exit. - - OpenSSL (unintentionally) changed these bits in the 3.0.0 and subsequent - 3.x releases, setting them to zero in the release versions (which happened - to also match the documentation), then changed them back in the 3.5.3 - release. If OpenSSL was upgraded to (or from) this version without - recompiling OpenSSH, it would cause OpenSSH flag it as potentially - incompatible and refuse to use it. Ultimately OpenSSL rolled this - back, but the check now has no value so is being removed for OpenSSL - versions >=3. - - bz#3865 and https://github.com/openssl/openssl/issues/28575, ok djm@ - -commit 35f3e2a41c2afe7a68a8a4efb3eb385e7f8d247d -Author: Darren Tucker -Date: Thu Sep 25 18:06:55 2025 +1000 - - Update pledge() interface to match current OpenBSD. - - ok djm@ - -commit 7ce3823547578a3b083085744c1fea39237197a2 -Author: Darren Tucker -Date: Tue Sep 23 22:12:19 2025 +1000 - - Merge all putty tests into a single test. - - The lets us reuse the built OpenSSH binaries and replaces 12*4min of - tests with a single 14min one. - -commit 1362f6c0f4ca3306a201a6572bb9ec0d47d8edb3 -Author: Darren Tucker -Date: Thu Sep 25 18:20:53 2025 +1000 - - Add #ifdefs in pwfree to match those in pwcopy. - - Fixes build on many platforms. - -commit 8235dc3d82c0ac347a3600df0907c6573720fbaa -Author: djm@openbsd.org -Date: Thu Sep 25 07:05:11 2025 +0000 - - upstream: fix some one-off leaks in ssh.c; ok dtucker@ - - OpenBSD-Commit-ID: bf3c27ffe4b3cccb6553b554ec4c04929065a2bc - -commit 846987d1233f24bbe87ebed347e328f45525388a -Author: djm@openbsd.org -Date: Thu Sep 25 07:04:38 2025 +0000 - - upstream: fix some one-off leaks in ssh-keygen; ok dtucker@ - - OpenBSD-Commit-ID: 32f51289c93246474659aa49067926fcab9e02e8 - -commit a1a7df8b3694fdd7b55ad6bb8fa7b3d5d7f5b89a -Author: djm@openbsd.org -Date: Thu Sep 25 07:00:43 2025 +0000 - - upstream: fix some leaks in ssh-add; feedback/ok dtucker@ - - OpenBSD-Commit-ID: 441302917de31a128c1d6d63acccc67042fcf349 - -commit a8a2702bcd9e81a086e6d2c278f1b62f9d8bf3a1 -Author: djm@openbsd.org -Date: Thu Sep 25 06:57:54 2025 +0000 - - upstream: fix some leaks; feedback/ok dtucker@ - - OpenBSD-Commit-ID: 05bdbc2e494b87a4a79e509020bd8249c86a4ff0 - -commit a071af0682d686de85cf471f5e04deaee4d90adb -Author: djm@openbsd.org -Date: Thu Sep 25 06:45:50 2025 +0000 - - upstream: wait for the unprivileged sshd-auth process to exit - - before closing the fd it uses to report log messages - - This avoids a race where the child process notices the - fd was closed before exiting and spams the logs. - - ok dtucker@ - - OpenBSD-Commit-ID: 7cddaa41be3b955e6bed570900db7ab8817b1e76 - -commit 4fddebe7f524b3403c876c3b399d5ce7ce3390a6 -Author: djm@openbsd.org -Date: Thu Sep 25 06:33:19 2025 +0000 - - upstream: add some functions to free various structs, including - - channels data and packet state; ok dtucker@ tb@ - - OpenBSD-Commit-ID: a8b3705309d632cdae370d4147a03e703087b0d1 - -commit d0c1e73d408a24b2db18c0aa1a0108bea0f24210 -Author: djm@openbsd.org -Date: Thu Sep 25 06:31:42 2025 +0000 - - upstream: fix leaks of config objects in - - mm_decode_activate_server_options ok dtucker@ tb@ - - OpenBSD-Commit-ID: 211f4d7d02e847bd1bcb460f6beb11658809a742 - -commit b62aa85dcbc8f03bf91d26d14fbf8fd5e172d882 -Author: djm@openbsd.org -Date: Thu Sep 25 06:25:38 2025 +0000 - - upstream: clarify intent and avoid (harmess, defined behaviour) - - unsigned underflow. ok tb@ - - OpenBSD-Commit-ID: b73bf5f1f381c3e4561a6cc706fb1cd77c939cd8 - -commit 6f28a935cc7d073e6647643e81d98b5831df204f -Author: jsg@openbsd.org -Date: Thu Sep 25 06:23:19 2025 +0000 - - upstream: consistently use NULL for null pointer constants found - - with sparse, ok djm@ - - OpenBSD-Commit-ID: 1067504b63732d809d0d57ad4bc626818d112772 - -commit 0af7e5b690e2cfe8824f04f154b0e543509dbefd -Author: jsg@openbsd.org -Date: Thu Sep 25 02:15:39 2025 +0000 - - upstream: remove unneeded externs ok djm@ - - OpenBSD-Commit-ID: fe553193e910a122505142a4e1db7358cc1ae653 - -commit ae62a16118bb96a8e449ef25f5e55ef86a52cefb -Author: jsg@openbsd.org -Date: Thu Sep 25 02:12:16 2025 +0000 - - upstream: remove prototype for removed ssh_packet_set_tos() ok - - djm@ - - OpenBSD-Commit-ID: 396f82995074ef4d7b9ce44168266ef4640d9985 - -commit d8588478850463f8945aa18d0358b2b227f8b57a -Author: jsg@openbsd.org -Date: Wed Sep 24 00:51:28 2025 +0000 - - upstream: spelling; ok dtucker@ - - OpenBSD-Commit-ID: 93870117b0153859dd8baa80b97e44d4558c786b - -commit eff358890a7cab1e7c2fec62e5b9914d2c1c8703 -Author: Darren Tucker -Date: Tue Sep 23 16:51:34 2025 +1000 - - Merge VM tests into a single workflow file. - - Should make it easier to manage, although it may cause a few extra runs. - -commit d00015d21190517a1f505eb8120f716b1c2e4055 -Author: Darren Tucker -Date: Tue Sep 23 16:38:45 2025 +1000 - - Test openssl-3.6 branch not beta1. - -commit 31fce4fc5aaf79b9a4bccf09467e86c56b482bde -Author: Darren Tucker -Date: Tue Sep 23 15:51:14 2025 +1000 - - Test openssl-3.6.0-beta1. - -commit b94e7251a17a497669e825cb70ac79c96bdc3472 -Author: Darren Tucker -Date: Tue Sep 23 11:32:57 2025 +1000 - - Specify rpath when building OpenSSL. - -commit b60b4bb7dd208efa4f22a95738303e8dd5184c39 -Author: Chris Rapier -Date: Mon Sep 22 17:38:47 2025 -0400 - - Typo in servconf.c - -commit a45dc2bbaa363447daa839a03336473af286e51e -Author: Chris Rapier -Date: Mon Sep 22 16:52:29 2025 -0400 - - Screwed up the revert in servconf. - - I used the new DSCP values from the 10.1 branch - instead of the 10.0 current. Annoying mistake - -commit 7be4edd2b2a1a952a70a0d4f4792e3a583fb1cbd -Author: Chris Rapier -Date: Mon Sep 22 16:45:11 2025 -0400 - - Needed to update the documentation for IPQoS - -commit 3893444c40501f5ab54319aa463f96de308b5496 -Author: Chris Rapier -Date: Mon Sep 22 16:30:44 2025 -0400 - - Reverted change to srevconf.c IPQoS options. - - We should only need to change the IPQoS options for the client - side to support RFC 8305. - -commit 0929ca44b7296320b085fe5803bbd62a69e30bfd -Author: Chris Rapier -Date: Mon Sep 22 14:36:05 2025 -0400 - - Make beta - -commit 83853aa5e35f3da0690bccd2983764d4e749a670 -Author: Darren Tucker -Date: Mon Sep 22 15:26:17 2025 +1000 - - Factor out OpenSSL install and test more versions. - - Move OpenSSL installation into its own script with a "-a" option to - install the "next" version to test for ABI compatibility. - -commit 2c1d38f7ffc8b8ec244bfe17ec8a85b3d737dcab -Author: Darren Tucker -Date: Mon Sep 22 16:55:49 2025 +1000 - - Exclude generated openbsd-compat/include directory. - -commit 67b3ed101a18348b564507f55e3ed4b7e0d23ff9 -Author: Darren Tucker -Date: Sat Sep 20 15:07:36 2025 +1000 - - Add OpenSSL 3.x ABI cross-compatibility test. - -commit c682c9f45a10ee0dc37fd716cfccd42271f92ddc -Author: Darren Tucker -Date: Sat Sep 20 15:05:19 2025 +1000 - - Add tests for OpenSSL 3.4 and 3.5 versions. - -commit 1659d0ac095608b809fd3173d2c48b7b39d40b02 -Author: Darren Tucker -Date: Sat Sep 20 15:53:04 2025 +1000 - - Build OpenSSL with -j4 to speed it up. - -commit ca9ac1109e2c875ea33da6818c1841aa2181e962 -Author: Darren Tucker -Date: Sat Sep 20 15:16:30 2025 +1000 - - Rerun tests if run_tests.sh changes. - -commit 311b5db3d1b69b4a9b61677cf11514254efd4ad0 -Merge: 698575f40 301963eef -Author: Chris Rapier -Date: Fri Sep 19 16:48:01 2025 -0400 - - Merge pull request #132 from rapier1/feature-fips-mode-check - - Disable the parallel AES-CTR cipher under FIPS mode. - -commit 301963eef556ff716fe3f56efbae45d26904f96e -Author: Chris Rapier -Date: Fri Sep 19 16:41:59 2025 -0400 - - Minor change in HPN-README - -commit 3b0ecec676dc7d143fbd6f0a4dc74d80c104831b -Author: Chris Rapier -Date: Fri Sep 19 16:39:19 2025 -0400 - - Typos in comments for misc.c fips_enabled(). - -commit 9b80ca074dbcd8e8f1aaf76a814ab5659fce6d97 -Author: Chris Rapier -Date: Fri Sep 19 16:36:41 2025 -0400 - - Fix typoes in HPN-README - -commit 2734b16e03b761aac2e72a40cccb70ff12ade32b -Merge: 20b3f4001 698575f40 -Author: Chris Rapier -Date: Fri Sep 19 12:36:13 2025 -0400 - - Merge branch 'dev_minor' into feature-fips-mode-check - -commit 20b3f4001c3cf250f67f94e25c18574111aa0abc -Author: Chris Rapier -Date: Fri Sep 19 12:33:05 2025 -0400 - - Delete aclocal.m4 and config.h.in - -commit bc328144f149af07139a0f2c1329018cd85b86b7 -Author: djm@openbsd.org -Date: Fri Sep 19 01:32:45 2025 +0000 - - upstream: log at level INFO when PerSourcePenalties actually blocks - - access to a source address range. Previously this was logged at level - VERBOSE, which hid enforcement actions under default config settings. - - ok dtucker, markus - - OpenBSD-Commit-ID: ea2b0d7c2253ff5205719d74b526cf2870df894d - -commit 698575f40cdf57eadd040361df4dbe6c0289f3e4 -Merge: c5b27f6d6 bdc5dcddf -Author: Chris Rapier -Date: Thu Sep 18 15:44:16 2025 -0400 - - Merge pull request #131 from rapier1/feature-happy-eyes - - Feature happy eyes - -commit c5b27f6d64eeead3120bfa75aae6539062c51bb4 -Merge: 27d8b7e9a bbeeec17f -Author: Chris Rapier -Date: Thu Sep 18 15:43:49 2025 -0400 - - Merge pull request #133 from rapier1/bug_CI_system - - Bug ci system - -commit 8e6d3dae0ecae14f5e703611ed8d4a71da3b6f9d -Author: Chris Rapier -Date: Thu Sep 18 14:58:03 2025 -0400 - - Updated HPN-README. Changed fips_enabled(). - - fips_enabled() in misc.c originally had debug messages that - reported if the parallel ciphers were enabled or not. This - was the wrong place for those messages. They should be in - session.c and ssh.c when we check the FIPS status. - - Also, the function had unclear variable names. These were - updated to be more descriptive. - -commit bbeeec17fa4f909be5da82f2f4cc04111518a0aa -Author: Chris Rapier -Date: Thu Sep 18 14:36:18 2025 -0400 - - Pull fix for agent-restrict failures of MacOS15 from OpenSSH - -commit cb7bc41b6aacf5b3390804afcfecf4c08087ec49 -Author: Chris Rapier -Date: Thu Sep 18 12:24:21 2025 -0400 - - Neglected to add scp-resume.sh to repo. Other - changes requested from review. - -commit fe39a907d1419fb011f9ae1cd457012b90b6cfe7 -Author: Chris Rapier -Date: Wed Sep 17 17:38:17 2025 -0400 - - Whitespace error in c-cpp.yml. - - Tabs not allowed in indents. - -commit 92189921f7bd139de292f7a6550ac3f08d07c3b8 -Author: Chris Rapier -Date: Wed Sep 17 16:18:32 2025 -0400 - - Remove parallel CC20 from cipher list if not using OpenSSL. - - This came up under CI testing with MacOS. - -commit 07f058a70454480aa49947fc6ec39a41e64a2cae -Author: Chris Rapier -Date: Wed Sep 17 16:13:40 2025 -0400 - - Various fixes to resolve problem with the CI tests - - These fixes include pushing the SCP resume tests to their - own test script. They don't work under windows so we now - skip them. - - It also includes a change to the XOR function in cipher-ctr-mt. - We were trying to do a 64 bit XOR but it was causing UBs in - some of the CI tests. Until we have that resolved we need to - stick with 32 bit XORs. Which we *really* need to resolve. - - The last major thing was that valgrind was consistently hanging on - the rekey test (valgrind-5). Using the --fair-sched=try option - for thread serialization in valgrind resolves that issue. - -commit 9736a40c836a845591728b64e92356f52e8de8e1 -Author: Chris Rapier -Date: Wed Sep 17 15:07:30 2025 -0400 - - Disable the parallel AES-CTR cipher under FIPS mode. - - While the AES-CTR algorithm is FIPS certified this implementation - is not. This causes FIPS to automatically error out when the aes-ctr-mt - cipher is loaded. This can be resolved by using the DisableMTAES options but - this requires the user to be aware of it and know why FIPS is erroring out. - This will automatically detect if FIPS mode is enabled on fedora variants that - write to /proc/sys/crypto/fips_enabled. In the event this entry doesn't exist - or that we can't read from it we assume that FIPS mode is not enabled and - we allow parallel ciphers. - - This does not apply to the ChaCha20 cipher as the algorithm itself is not - FIPS validated and it's up to the admin to make sure it's not being - offered as an option. - -commit bdc5dcddf44323fe8081ac8e449a2d33da230225 -Merge: 18b6d1f6a 27d8b7e9a -Author: Chris Rapier -Date: Wed Sep 17 14:06:52 2025 -0400 - - Merge branch 'dev_minor' into feature-happy-eyes - -commit 18b6d1f6a5544785ad28b00b09306064ec3c5317 -Author: Chris Rapier -Date: Wed Sep 17 14:04:05 2025 -0400 - - Update HPN-README - -commit f26be1c90f75d40b28b8f3a3a83be2156b766397 -Author: Chris Rapier -Date: Wed Sep 17 13:44:04 2025 -0400 - - Added logic to handle the IP QoS issue in commit acd4634f. - - We were previously resolving the issue by changing the defaults - for all connections. We now only change the QoS defaults if - we are using RRFC 8305. - -commit 0a878a79785b66275041e771f140af8b23bd2683 -Author: Chris Rapier -Date: Wed Sep 17 13:28:09 2025 -0400 - - Cleanup up of debug statements. Code review. - -commit 80993390bed15bbd1c348f3352e55d0db01ca0fd -Author: Darren Tucker -Date: Wed Sep 17 17:41:41 2025 +1000 - - Whitespace. - -commit fc704057ce6b75637645a4b9c917565b3563e21b -Author: Darren Tucker -Date: Wed Sep 17 17:33:25 2025 +1000 - - Move Gihub VMs to their own status line. - -commit 2202e5f9008003044cac01ed70d83deec42ad4e0 -Author: Darren Tucker -Date: Tue Sep 16 23:00:14 2025 +1000 - - Use relative URLs for status - -commit 7c32e09ea3e5c7e1fa0b7e2d4ddc83f8beadafed -Author: Darren Tucker -Date: Mon Sep 15 17:21:15 2025 +1000 - - Add VM test targets via vmaction on Github. - -commit a4aa090a3d40dddb07d5ebebc501f6457541a501 -Author: djm@openbsd.org -Date: Mon Sep 15 03:00:22 2025 +0000 - - upstream: memory leaks in unit tests - - OpenBSD-Regress-ID: af11ac7b8034b99ca324af4dae1ef5cd7700b273 - -commit 6f5942454ad6756355f3b4983ab882cf15e44440 -Author: djm@openbsd.org -Date: Mon Sep 15 05:17:37 2025 +0000 - - upstream: fix leaks of struct sftp_conn in scp; ok dtucker@ - - OpenBSD-Commit-ID: 76bea50b5b87b750c3771bf80feb6067d994a9d2 - -commit 52f38c76fcb38dfe619d8caa3bb4bb782c785026 -Author: djm@openbsd.org -Date: Mon Sep 15 04:52:41 2025 +0000 - - upstream: leak of principals file lines; ok dtucker@ - - OpenBSD-Commit-ID: 918bf1b70e5a969059300f3c23d45911690d9015 - -commit b9464cee0fd084d89d91696a17b3621b4cf512bf -Author: djm@openbsd.org -Date: Mon Sep 15 04:52:12 2025 +0000 - - upstream: leak of authentication options at exit; ok dtucker@ - - OpenBSD-Commit-ID: ba559799c2ff9b10afc3abefb1797c0843a6ff24 - -commit 0bb37080c86674de7cdfb56c80add3cd316c68a8 -Author: djm@openbsd.org -Date: Mon Sep 15 04:51:35 2025 +0000 - - upstream: memleak of keys not used for authentication; ok - - dtucker@ - - OpenBSD-Commit-ID: ddfda79d243150fbd382d8f2cd75a90a072b3669 - -commit ee99f6e93e0ee90eedbd27ffb9b7f9fef7b98010 -Author: djm@openbsd.org -Date: Mon Sep 15 04:50:42 2025 +0000 - - upstream: memleak of certificate path; ok dtucker@ - - OpenBSD-Commit-ID: 90dc5390f2756ba339e2e6df54d4b8651d64c1e7 - -commit 42fc6b6f9fbf58293b070f4de377c7695c275a8a -Author: djm@openbsd.org -Date: Mon Sep 15 04:49:41 2025 +0000 - - upstream: memleak of hostkey when downgrading host cert->key; ok - - dtucker - - OpenBSD-Commit-ID: f6f1f38a8ec144fb615434f6877066cf4610b826 - -commit bc60bd55cbc1f8139c840668733b51475cbefd93 -Author: djm@openbsd.org -Date: Mon Sep 15 04:49:00 2025 +0000 - - upstream: memleak of editline history; ok dtucker@ - - OpenBSD-Commit-ID: a244c54eb074cf7fbe28f7ac4f03ace270f7a999 - -commit ee77ab9b2ca2d70daf8d4352f5daffa8036ece64 -Author: djm@openbsd.org -Date: Mon Sep 15 04:48:29 2025 +0000 - - upstream: memleak of rfwd callback context; ok dtucker@ - - OpenBSD-Commit-ID: 70b2aafeaace90703dd16a44a2a0b723d9155f33 - -commit 0088b3f0ab2c615ae95b9f374963abaa0ab837ec -Author: djm@openbsd.org -Date: Mon Sep 15 04:47:49 2025 +0000 - - upstream: memleaks of request packet and hostkeys blob; ok - - dtucker@ - - OpenBSD-Commit-ID: 313b13a8e36b4ca8e064ee56792e67e0670a386a - -commit d68451a25808c4eee74b898873cd4761f73651ed -Author: djm@openbsd.org -Date: Mon Sep 15 04:41:20 2025 +0000 - - upstream: memleak of KRL revoked certs struct; ok dtucker - - OpenBSD-Commit-ID: f319868e0b2de49c41c735e75b87c403f009f5f9 - -commit 67940cc2f329427d3acb64d4893faf4527e58d5c -Author: djm@openbsd.org -Date: Mon Sep 15 04:40:34 2025 +0000 - - upstream: memleak of kex->server_sig_algs; ok dtucker@ - - OpenBSD-Commit-ID: 41a3f64edd2c9b8addb2e445514ae25c24819e2c - -commit fae8e41741d23298c94a1ea3ef8704a1cc186cb5 -Author: djm@openbsd.org -Date: Mon Sep 15 04:39:58 2025 +0000 - - upstream: fix memleak of channel forwarding permissions; ok - - dtucker@ - - OpenBSD-Commit-ID: 069745547109bc8fcc09fab5b19c53599cae99fd - -commit 03872018c14ed943bc01a4e88be59195a742f106 -Author: djm@openbsd.org -Date: Mon Sep 15 04:39:15 2025 +0000 - - upstream: when merging auth options into the active set, don't - - leak the old struct sshauthopt; ok dtucker@ - - OpenBSD-Commit-ID: c6bfd7bc2932e37f811b3c53272c3b919d33e75b - -commit efed5da4ced88170cf474246eff771dd16c7092f -Author: djm@openbsd.org -Date: Mon Sep 15 04:38:00 2025 +0000 - - upstream: fix memleak when applying certificate options; ok - - dtucker - - OpenBSD-Commit-ID: 36c219dcc05f4df82a0f9c500bdf5dbfea925289 - -commit edc601707b583a2c900e49621e048c26574edd3a -Author: djm@openbsd.org -Date: Thu Sep 11 07:23:32 2025 +0000 - - upstream: disable ssh-add autoexpiry of certificates when testing - - expired certificates - - OpenBSD-Regress-ID: 64aadd23d37fd0b3a06498151f2cf83be7ac342c - -commit c60153e4878f3a6700af69adbdd1863003e78abf -Author: djm@openbsd.org -Date: Thu Sep 11 07:22:37 2025 +0000 - - upstream: correct getopt() string - - OpenBSD-Commit-ID: 05ef9581a3dab32ec93aa5b9c3349ed1e7da9ec8 - -commit 7a4738af45201c115a9e20f830f30ed38ce6be76 -Author: djm@openbsd.org -Date: Thu Sep 11 03:29:58 2025 +0000 - - upstream: need time.h for time(3) - - OpenBSD-Commit-ID: 530964039cccab679432b6c5b28d2b0aa9760b00 - -commit 0c719c6aabc061f02a907fc96c390d0449b49f26 -Author: djm@openbsd.org -Date: Thu Sep 11 02:54:42 2025 +0000 - - upstream: When adding certificates to an agent, set the expiry to - - the certificate expiry time plus a short (5 min) grace period. - - This will cause the agent to automtically remove certificates shortly - after they expire. - - A new ssh-add -N option disables this behaviour. - - Feedback/ok deraadt@ - - OpenBSD-Commit-ID: 92fed1bba1025069ad45deebb534be7530e181df - -commit e9dcccc3541b0ae1c43581ed26215d5cc82e4be0 -Author: jsg@openbsd.org -Date: Mon Sep 8 00:31:54 2025 +0000 - - upstream: remove unused 0-sized files; ok deraadt@ - - OpenBSD-Commit-ID: 7e8178786157e863f6ff63c5d55200d7b6b04f9e - -commit d16b1b484a024ee6b35094e7d9d55bf96b96253b -Author: dtucker@openbsd.org -Date: Fri Sep 5 10:34:35 2025 +0000 - - upstream: Tabs->spaces. Removes diff vs portable. - - OpenBSD-Commit-ID: 06598021a9f08188dab29ac956b2baa002a0ff85 - -commit 3d8ae7f235b96da604b08c44ae83420e367eeab4 -Author: Tim Rice -Date: Mon Sep 8 12:53:10 2025 -0700 - - modified: regress/rekey.sh - Fix for when building out of tree. - -commit 54abadd3f286efea0dbbdbfea8011d5e1e30c074 -Author: Darren Tucker -Date: Sun Sep 7 13:35:22 2025 +1000 - - Accept OpenSSL 4.0.0-dev versions. - - They seem to work, at least for now. - -commit 67a8bf4e4057597170bfa923fe2ce5bf90c43974 -Author: Maxim Khon -Date: Mon Aug 18 12:05:42 2025 +0000 - - Use SSH_TUN_COMPAT_AF on FreeBSD. - - Otherwise tun forwarding from other OSes fails as soon as the first IPv6 - message is sent by the other side (which is usually a Router Solicitation - ICMPv6 message which is sent as soon as the interface is up): all other - OS'es use SSH_TUN_COMPAT_AF or SSH_TUN_PREPEND_AF which effectively uses - OpenBSD AF_INET/AF_INET6 values. - -commit 3ca274e44cb2c2351376fc14e4c3e92ba4a8f87b -Author: Darren Tucker -Date: Fri Sep 5 21:32:30 2025 +1000 - - Check for nlist function. - - Check for nlist function presence before attenmpting to use it instead - of relying on the presence of the nlist.h header. Mac OS X, in particular - has the header, but only has the function in the 32bit libraries. - -commit ee32a36c62424f13907023595bfa8b23a528ced1 -Author: dtucker@openbsd.org -Date: Fri Sep 5 10:23:55 2025 +0000 - - upstream: Order includes as per KNF and add time.h. Removes diff - - vs portable. - - OpenBSD-Commit-ID: 38043f0bfa17c48ef6d1a744c2834b4405bc9311 - -commit 0ac179c9540e2b05b4c1194db69ce01306c253d3 -Author: dtucker@openbsd.org -Date: Fri Sep 5 10:17:21 2025 +0000 - - upstream: Order headers as per KNF. Removes diff vs portable. - - OpenBSD-Commit-ID: 4df519fd9fa13ce9653adf7a3d1076e20591d886 - -commit e80322284f3ee70b6b760a9f83179470d675e5ba -Author: dtucker@openbsd.org -Date: Fri Sep 5 10:01:35 2025 +0000 - - upstream: Order headers as per KNF. - - OpenBSD-Commit-ID: 7156b69b0364c68e181e0f6fa17c0f05c72e8670 - -commit bb8ac0515e68cab63db2d026eb60127185a3d2b8 -Author: Darren Tucker -Date: Fri Sep 5 20:39:16 2025 +1000 - - Resync header order with upstream. - -commit 024b694249482698b0c73d24da0eaec696fca8c8 -Author: Darren Tucker -Date: Fri Sep 5 20:37:04 2025 +1000 - - Resync header order with upstream. - -commit aed6a958bc108faab64bc2855d6ed93894cfc6ff -Author: Darren Tucker -Date: Fri Sep 5 20:30:20 2025 +1000 - - Sync includes with upstream. - -commit 22cfd2dd32f34f0cea218dd651f3aa9544b6e3b5 -Author: Darren Tucker -Date: Fri Sep 5 20:26:14 2025 +1000 - - Move ssh-pkcs11.h include to match upstream. - -commit b34c16bc4cac2962cc6a7517efbc4fed2c8a2d9a -Author: Darren Tucker -Date: Fri Sep 5 20:20:27 2025 +1000 - - Reorder includes to match upstream. - -commit 441a8fa9a0178704bce497bff92ca43fcf04bf7a -Author: dtucker@openbsd.org -Date: Fri Sep 5 09:58:08 2025 +0000 - - upstream: Order headers as per KNF. Removes diff vs portable. - - OpenBSD-Commit-ID: db72be57429418f6a4319bbe34c98fc103e11ce0 - -commit 19d6a7afb256c4afc571dbf56a013ef91cd9596f -Author: dtucker@openbsd.org -Date: Fri Sep 5 09:49:26 2025 +0000 - - upstream: Order headers as per KNF. Also removes diff vs - - -portable. - - OpenBSD-Commit-ID: 2061307dc938712e524bc9da48a52f545e43670e - -commit 932e9f200bd48b7568eb21ec456c67ec92d517e2 -Author: dtucker@openbsd.org -Date: Fri Sep 5 09:31:31 2025 +0000 - - upstream: Remove unused rmd160.h header. ripemd160 support was - - removed in 2017. - - OpenBSD-Commit-ID: 937fca21498b921adf6e04bac120f4a2e7975b3c - -commit f93de828b9b0f29bff51d38ea92d0759595ec30b -Author: Darren Tucker -Date: Fri Sep 5 20:07:16 2025 +1000 - - Create replacement nlist.h if needed. - - Remove #ifdef HAVE_NLIST_H wrapper. ok djm@ - -commit 6aac2beaa53467e83f6a137376b6dcf423ab6f6c -Author: Darren Tucker -Date: Fri Sep 5 19:55:20 2025 +1000 - - Create replacement endian.h if needed. - - Remove #ifdef HAVE_ENDIAN_H wrapper. ok djm@ - -commit a60721c894f0a2ce973876d0f55617e187e6fab1 -Author: Darren Tucker -Date: Fri Sep 5 19:52:48 2025 +1000 - - Add /* WITH_OPENSSL */ comments. - - Removes diffs vs upstream. - -commit c729a833298d9d55ffb22771cf1400dfdc640164 -Author: Darren Tucker -Date: Fri Sep 5 19:22:37 2025 +1000 - - Move sys/time.h include to match upstream. - -commit caa973dd06a7be43c29353b256c9a473f5ad9882 -Author: Darren Tucker -Date: Fri Sep 5 19:13:52 2025 +1000 - - Create replacement netgroup.h if needed. - - Remove #ifdef HAVE_NETGROUP_H wrapper. ok djm@ - -commit 7d30526b7df14d960a5de63d6af823ffdab86518 -Author: Darren Tucker -Date: Fri Sep 5 18:24:59 2025 +1000 - - Remove stray #endif left from previous. - -commit 4911f2600fdbb1959311bb1886bfe51f7dd4a74e -Author: Darren Tucker -Date: Fri Sep 5 18:08:51 2025 +1000 - - Create replacement libgen.h if needed. - - Remove #ifdef HAVE_LIBGEN_H wrapper. ok djm@ - -commit 65dcdb56f5daee519ec824ae17e64412d2492f90 -Author: Darren Tucker -Date: Fri Sep 5 18:05:15 2025 +1000 - - Create replacement sys/un.h if needed. - - Remove #ifdef HAVE_SYS_UN_H wrapper. ok djm@ - -commit 60334af5a908ac3b263d2ec696f9977e20b739cb -Author: Darren Tucker -Date: Fri Sep 5 18:03:55 2025 +1000 - - Reformat replacement header check one per line. - -commit cd9ba068e36b0f37374d2eba2d19dacc7ea9a167 -Author: Darren Tucker -Date: Fri Sep 5 17:55:33 2025 +1000 - - Create replacement time.h if needed. - - Remove #ifdef HAVE_TIME_H wrapper. ok djm@ - -commit ea586edbcbec7089f768ed682a79a399eaa1e5b1 -Author: Darren Tucker -Date: Fri Sep 5 17:50:18 2025 +1000 - - Create replacement sys/stat.h if needed. - - Remove #ifdef HAVE_SYS_STAT_H wrapper. ok djm@ - -commit 59b80707c6cf45230597a800e7d2ce6b00ce35b5 -Author: Darren Tucker -Date: Fri Sep 5 17:44:07 2025 +1000 - - Create replacement sys/time.h if needed. - - Remove #ifdef HAVE_SYS_TIME_H wrapper. ok djm@ - -commit 82fed5110fe09e9af258a8f5a2f92ffb397fff5b -Author: Darren Tucker -Date: Fri Sep 5 17:31:15 2025 +1000 - - Create replacement ifaddrs.h if needed. - - Remove #ifdef HAVE_IFADDRS_H wrapper. ok djm@ - -commit 53887d8ebc583b51e996cb2bdeb11e054d36343b -Author: Darren Tucker -Date: Fri Sep 5 17:27:43 2025 +1000 - - Create replacement util.h if needed. - - Remove #ifdef HAVE_UTIL_H wrapper. ok djm@ - -commit 5f09983d1e724097bd577097fb0f2c00c2436f21 -Author: Darren Tucker -Date: Fri Sep 5 17:24:50 2025 +1000 - - Create replacement paths.h if needed. - - Remove #ifdef HAVE_PATHS_H wrapper. ok djm@ - -commit d45b17dc5a0598dda2b11dc89598203408d2d59c -Author: Darren Tucker -Date: Fri Sep 5 17:17:52 2025 +1000 - - Create replacement poll.h if needed. - - Remove #ifdef HAVE_POLL_H wrapper. ok djm@ - -commit 9b2c5a2db0650e394597839ef00d797f57568937 -Author: Darren Tucker -Date: Fri Sep 5 17:06:14 2025 +1000 - - Fill in missing system header files. - - Create replacement header files inside openbsd-compat for common headers - that are missing on a given platform. Usually these are just empty, - but in some cases they'll include the equivalent file. This avoids - having to wrap those includes in '#ifdef HAVE_FOO_H' and reduces the - diff vs OpenBSD. - - If we create any such headers, add the path to includes. - - Initially just stdint.h, more to follow. - - ok djm@ - -commit f64701ca25795548a61614d0b13391d6dfa7f38c -Author: djm@openbsd.org -Date: Thu Sep 4 03:04:44 2025 +0000 - - upstream: repair test after changes to percent expansion of usernames - - on the commandline. - - Test more cases that should/shouldn't expand and lightly test - username validity checks. - - OpenBSD-Regress-ID: ad4c12c70bdf1f959abfebd1637ecff1b49a484c - -commit 45698669d49949868b1f3d13dfda1b7cb70060ad -Author: djm@openbsd.org -Date: Thu Sep 4 00:37:10 2025 +0000 - - upstream: unit tests for sshbuf_equals and sshbuf_dtourlb64; ok - - deraadt@ - - OpenBSD-Regress-ID: bab54e2d4caa813036a63ee67e92c93e6712a5b9 - -commit 4be445116f1b56f14254b98d8b132bb25777e160 -Author: djm@openbsd.org -Date: Thu Sep 4 00:34:17 2025 +0000 - - upstream: unit tests for a bunch of misc.c functions; ok deraadt@ - - OpenBSD-Regress-ID: 886cf142605405e777ee77a96b48694dc2e9235d - -commit e3699ff47df336f57da2e78188d0057f8368af56 -Author: djm@openbsd.org -Date: Thu Sep 4 00:32:31 2025 +0000 - - upstream: fix sshbuf_dtourlb64() to not choke on empty buffers; - - previously it incorrectly returned an error in this situation; ok deraadt - - OpenBSD-Commit-ID: e62773d6e8cb95a19aab54f0af0edbcd47b345c0 - -commit 8e85ad33cfcc71e03594e53f2e19d8ce2e27dcc6 -Author: djm@openbsd.org -Date: Thu Sep 4 00:31:49 2025 +0000 - - upstream: fix rtrim() function to not attempt to delete whitespace - - inside a string, just at the end. ok deraadt@ - - OpenBSD-Commit-ID: d44deaa43580cd88de978dd5509b14e905b67b84 - -commit 43b3bff47bb029f2299bacb6a36057981b39fdb0 -Author: djm@openbsd.org -Date: Thu Sep 4 00:30:06 2025 +0000 - - upstream: don't allow \0 characters in url-encoded strings. - - Suggested by David Leadbeater, ok deraadt@ - - OpenBSD-Commit-ID: c92196cef0f970ceabc1e8007a80b01e9b7cd49c - -commit 35d5917652106aede47621bb3f64044604164043 -Author: djm@openbsd.org -Date: Thu Sep 4 00:29:09 2025 +0000 - - upstream: Improve rules for %-expansion of username. - - Usernames passed on the commandline will no longer be subject to - % expansion. Some tools invoke ssh with connection information - (i.e. usernames and host names) supplied from untrusted sources. - These may contain % expansion sequences which could yield - unexpected results. - - Since openssh-9.6, all usernames have been subject to validity - checking. This change tightens the validity checks by refusing - usernames that include control characters (again, these can cause - surprises when supplied adversarially). - - This change also relaxes the validity checks in one small way: - usernames supplied via the configuration file as literals (i.e. - include no % expansion characters) are not subject to these - validity checks. This allows usernames that contain arbitrary - characters to be used, but only via configuration files. This - is done on the basis that ssh's configuration is trusted. - - Pointed out by David Leadbeater, ok deraadt@ - - OpenBSD-Commit-ID: e2f0c871fbe664aba30607321575e7c7fc798362 - -commit f38a552dc71f20df2544338099e3fe2563f1a9ca -Author: Damien Miller -Date: Wed Sep 3 09:42:39 2025 +1000 - - missing header - -commit cc4eb3d6943cb57e08ab3abbcf92644deb429e46 -Author: djm@openbsd.org -Date: Tue Sep 2 11:08:34 2025 +0000 - - upstream: simplify algorithm list functions using xextendf(); ok - - dtucker@ - - OpenBSD-Commit-ID: ffc5f8d0c25b95705a8a66c8b634f98d23bd92dc - -commit 8866d24cdd1d6e73bb3220b753f94e255c49ff96 -Author: djm@openbsd.org -Date: Tue Sep 2 11:04:58 2025 +0000 - - upstream: unit test for xextendf() - - OpenBSD-Regress-ID: ddb3b4db1a52dda23696b967470882fe2b9c3af7 - -commit 2f369d3fd0ff3715c2b32dff5cb35c0330272445 -Author: djm@openbsd.org -Date: Tue Sep 2 09:41:23 2025 +0000 - - upstream: fix comment on sshbuf_froms() - it *returns* an error - - code, the allocated buffer is passed via argument - - OpenBSD-Commit-ID: b2b0a76df71328f39c3e2ad941a4d87085d8335d - -commit 6fd93060bb2ec35a7f0bf96d1a74104bab49e017 -Author: djm@openbsd.org -Date: Tue Sep 2 09:40:19 2025 +0000 - - upstream: GssStrictAcceptor was missing from sshd -T output; fix - - OpenBSD-Commit-ID: 6014049ccfedc48a208e37d5488ade6bdc2d1c44 - -commit d94a9a8c54e9036961c1100c6f445c50ab9b6b40 -Author: Damien Miller -Date: Tue Sep 2 19:38:39 2025 +1000 - - portable-specific comment grammer/spelling fixes - -commit a0b095fa03d3c08d723a803ce25540fddd955c53 -Author: djm@openbsd.org -Date: Tue Sep 2 09:34:48 2025 +0000 - - upstream: grammar and typos in comments - - OpenBSD-Commit-ID: de954daffcd0147ce142d55e8a374810cd19d7ed - -commit 23a2bb750547a9a5251cbc44c5ceb1d05303befe -Author: Damien Miller -Date: Tue Sep 2 19:30:07 2025 +1000 - - replace remaining manual logging of __func__ - - Use the appropriate log macro that prepends the function name - (e.g. logit_f/debug2_f/etc). - -commit a9b0b69f15e63bc4e8c8b38e24ee85ea076a7e11 -Author: djm@openbsd.org -Date: Tue Sep 2 09:26:21 2025 +0000 - - upstream: replace remaining cases where we manually included __func__ - - in a debug or error log with the respective *_f log variant - - OpenBSD-Commit-ID: 46a280d78bcc0bc98f28e65a30b613366600328f - -commit 19f7cb39eecb4b8f768f37e8294dc3a9142e022b -Author: djm@openbsd.org -Date: Mon Sep 1 23:55:29 2025 +0000 - - upstream: test MaxStatups idempotency; ok dtucker@ - - OpenBSD-Regress-ID: b5d713c2709000fa5e41d82c0cf8627e13cb43f9 - -commit c357c4a1e626feba9a968b5f0cb832b989b2d433 -Author: djm@openbsd.org -Date: Thu Aug 21 05:55:30 2025 +0000 - - upstream: benchmark more diffie-hellman-group* KEXs - - use current KEX names, i.e. remove the "@openssh.com" where the KEX - has been standardised - - OpenBSD-Regress-ID: a67e9da4efd9a971d39cb2481093f836046f9b7f - -commit 9313233a735733821dfd170b70782fb7da492962 -Author: djm@openbsd.org -Date: Tue Sep 2 01:03:43 2025 +0000 - - upstream: fix previous - - OpenBSD-Commit-ID: 09d95dfb5e064a1d0e74afba8d77474cc1d110a4 - -commit 683d0abe596b069a896f1688f86256f1beeb0cdc -Author: djm@openbsd.org -Date: Mon Sep 1 23:53:16 2025 +0000 - - upstream: Make MaxStartups and PerSourceNetBlockSize first-match-wins - - as advertised. bz3859 reported by jan.v.hofmann; ok dtucker - - OpenBSD-Commit-ID: 08f7786f1b3b4a05a106cdbd2dc5f1f2d8299447 - -commit a9a3f025d76f06a6601e6e8d52b468ec467865d9 -Author: djm@openbsd.org -Date: Fri Aug 29 03:50:38 2025 +0000 - - upstream: remove experimental support for XMSS keys; - - ok deraadt markus - - OpenBSD-Commit-ID: 38eaf4df6189acad9e46eddf7cf32d7f6d07df35 - -commit 908e9d55139bed19ed87d6fec749974eb42702c6 -Author: caspar@openbsd.org -Date: Mon Aug 18 18:39:33 2025 +0000 - - upstream: ssh_config.5: say "post-quantum" instead of "post quantum - - safe", and rephrase the sentence to make it easier to read. - - Input djm@, input and OK deraadt@, OK dtucker@ - - OpenBSD-Commit-ID: c3ee4d1cafdcfc20cc0d2f086021efce4b19c075 - -commit ceca966bde4ab38b2434876416da12fe16747459 -Author: job@openbsd.org -Date: Mon Aug 18 09:16:36 2025 +0000 - - upstream: Delete unused accessor function - - OK dtucker@ - - OpenBSD-Commit-ID: 93b59ac088fb254e1189729ece5bb9656d6e810b - -commit 3ef1a87d0a29eac94f32371af628e81eb2e2d817 -Author: Damien Miller -Date: Mon Aug 18 17:00:26 2025 +1000 - - Fix pledge(2) special casing - - Unbreaks non-OpenBSD platforms - -commit 5e9ca80fe65e407428dc46ed45804724d08b91b7 -Author: Damien Miller -Date: Mon Aug 18 16:47:23 2025 +1000 - - Match version instead of groups in connect-bigconf - - The connect-bigconf makes a giant config file to test config passing - between the sshd subprocesses. Previously it used a bunch of "Match - group" lines to construct a large file. However checking group - membership can be expensive (e.g. if a large groups database is - present or if group lookup is remote via NSS). This could be slow - enough to exceed LoginGraceTime. - - This switches it to "Match version" which is just a string compare - and does just as well for making a giant nonsense config file. - -commit 6c84609e5f9ddd49e250d5cf190b2820dbeca178 -Author: Damien Miller -Date: Mon Aug 18 16:47:00 2025 +1000 - - depend - -commit 9184fa363687fcb5dac056b093fb3b8e9d327242 -Author: Damien Miller -Date: Mon Aug 18 16:45:15 2025 +1000 - - check for setsockopt IP_TOS in OpenBSD pledge - - OpenBSD has recently relaxed the pledge(2) sandbox to allow some - setsockopt options to be changed without the "inet" promise. - - This adds compatibility for OpenBSD that predates this relaxation. - -commit ae44cd74f3a4ac711152f50b2712803ccf785593 -Author: djm@openbsd.org -Date: Mon Aug 18 04:50:35 2025 +0000 - - upstream: cast - - OpenBSD-Commit-ID: d69bd2328513c2dcd99f4f346b77e2bd90cf1964 - -commit c2c8bae39380392449ac3297061cbfc486126ad5 -Author: djm@openbsd.org -Date: Mon Aug 18 04:38:21 2025 +0000 - - upstream: missing set_log_handler() call in ssh-auth.c, exposed after - - last commit - - OpenBSD-Commit-ID: 09f5c3cf33c18b8ad321edbf96c30ae3deada2b0 - -commit 056022261e6cf7eb65bbacac72afe5f4d5945f2c -Author: Damien Miller -Date: Mon Aug 18 14:22:32 2025 +1000 - - depend - -commit b7ee13fbbb4ebafcf71f29685f053ecb97d1bcef -Author: Damien Miller -Date: Mon Aug 18 14:22:18 2025 +1000 - - wrap SIGINFO in ifdef - -commit 289239046b2c4b0076c14394ae9703a879e78706 -Author: djm@openbsd.org -Date: Mon Aug 18 03:43:01 2025 +0000 - - upstream: Make ssh(1) and sshd(8) set IP QoS (aka IP_TOS, IPV6_TCLASS) - - continually at runtime based on what sessions/channels are open. - - Previously, ssh(1) and sshd(8) would pick a QoS value when they - were started and use it for the whole connection. This could - produce suboptimal choices for the QoS value, e.g. for multiplexed - sessions that started interactive but picked up a sftp client, - or sessions that moved large amounts of data via port forwarding. - - Now the QoS value will change to the non-interactive IPQoS whenever - a "non-interactive" channel is open; basically any channel that lacks - a tty other than agent forwarding. - - This is important now that the default interactive IPQoS is EF - (Expedited Forwarding), as many networks are configured to allow - only relatively small amounts of traffic of this class and they will - aggressively deprioritise the entire connection if this is exceeded. - - NB. because ssh(1) and sshd(8) now change IP_TOS/IPV6_TCLASS - continually via setsockopt(), this commit requires a recent pledge(2) - change that landed recently in the OpenBSD kernel. Please ensure - you have updated to a kernel from within the last two weeks before - updating OpenSSH. - - with job@ deraadt@ - - OpenBSD-Commit-ID: 325fc41717eecdf5e4b534bfa8d66817425b840f - -commit dc5147028ff19213a32281dad07bba02e58da3fa -Author: djm@openbsd.org -Date: Mon Aug 18 03:29:11 2025 +0000 - - upstream: SIGINFO handler for sshd(8) to dump active - - channels/sessions ok deraadt@ - - OpenBSD-Commit-ID: 9955cb6d157c6d7aa23a819e8ef61b1edabc8b7d - -commit f807a598c96be683d97810481e954ec9db6b0027 -Author: djm@openbsd.org -Date: Mon Aug 18 03:28:36 2025 +0000 - - upstream: SIGINFO handler for ssh(1) to dump active - - channels/sessions ok deraadt@ - - OpenBSD-Commit-ID: 12f88a5044bca40ef5f41ff61b1755d0e25df901 - -commit 9b61679d73a8a001c25ab308db8a3162456010cf -Author: djm@openbsd.org -Date: Mon Aug 18 03:28:02 2025 +0000 - - upstream: add channel_report_open() to report (to logs) open - - channels; ok deraadt@ (as part of bigger diff) - - OpenBSD-Commit-ID: 7f691e25366c5621d7ed6f7f9018d868f7511c0d - -commit 80b5ffd22abd4093201939e31d1ea6dc8cc7913a -Author: djm@openbsd.org -Date: Mon Aug 18 01:59:53 2025 +0000 - - upstream: make -E a no-op in sshd-auth. Redirecting logging to a - - file doesn't work in this program as logging already goes via the parent - sshd-session process. ok dtucker@ - - OpenBSD-Commit-ID: 73325b9e69364117c18305f896c620a3abcf4f87 - -commit 3a039108bd25ff10047d7fa64750ed7df10c717c -Author: Damien Miller -Date: Mon Aug 18 13:46:37 2025 +1000 - - allow some socket syscalls in seccomp sandbox - - Allow getsockname(2), getpeername(2) and getsockopt(2). - - Also allow setsockopt(2) but only IP_TOS and IPV6_TCLASS. - - Note that systems that use the older socketcall(2) mux syscall will - not have IP_TOS and IPV6_TCLASS allowlisted. On these platforms, - these calls will be soft-blocked (i.e. will fail rather than - terminate the whole process with a sandbox violation). - - Needed for upcoming IPQoS change; ok dtucker@ - -commit a00f5b02e171bc6d6fb130050afb7a08f5ece1d8 -Author: Damien Miller -Date: Mon Aug 18 13:44:53 2025 +1000 - - handle futex_time64 properly in seccomp sandbox - - Previously we only allowed __NR_futex, but some 32-bit systems - apparently support __NR_futex_time64. We had support for this - in the sandbox, but because of a macro error only __NR_futex was - allowlisted. - - ok dtucker@ - -commit 32deb00b38b4ee2b3302f261ea1e68c04e020a08 -Author: dtucker@openbsd.org -Date: Thu Aug 14 10:03:44 2025 +0000 - - upstream: Cast serial no for %lld to prevent compiler warnings on some - - platforms. - - OpenBSD-Commit-ID: afadd741622f16c6733d461c0d6053ed52868a57 - -commit 883886c959ecab152650e231335857eb3193c662 -Author: dtucker@openbsd.org -Date: Thu Aug 14 09:44:39 2025 +0000 - - upstream: Cast serial no for %lld to prevent compiler warnings on some - - platforms. - - OpenBSD-Commit-ID: 46c6063284d318f7e4dc922479a3e394c94b0588 - -commit fde5a4d2cd01bea700439fa6d5bbad88e65c99bd -Author: dtucker@openbsd.org -Date: Thu Aug 14 09:26:53 2025 +0000 - - upstream: Cast serial no for %lld to prevent compiler warnings on some - - platforms. - - OpenBSD-Commit-ID: 15644234b58abc9c6da2994f0422a5aa344a9e89 - -commit 27d8b7e9a5500ff36fad33f1aa60dfecb5af73e2 -Merge: 7351c8c41 e3d333cda -Author: Chris Rapier -Date: Wed Aug 13 12:47:45 2025 -0400 - - Merge pull request #128 from rapier1/dev_minor - - Fixes to CI system - -commit e3d333cda1e557bf8b02dd1ba1b329bc98f63ee7 -Author: Chris Rapier -Date: Wed Aug 13 11:07:06 2025 -0400 - - Remove AWS-LC and Boringssl tests. - -commit ab5074dfb614e3801fecbd376d8ed4cea613c629 -Author: sthen@openbsd.org -Date: Tue Aug 12 11:09:48 2025 +0000 - - upstream: fix typo, ok markus dtucker - - OpenBSD-Commit-ID: 8f223da7633752162c64a659c6cf55202703d870 - -commit 8b6c1f402feb9eb6438003a312d7ffe8d5669896 -Author: deraadt@openbsd.org -Date: Mon Aug 11 14:37:43 2025 +0000 - - upstream: Handle localtime_r() failure by return "UNKNOWN-TIME" - - which is only used in user-visible contexts. freebsd 288773 shows their - localtime_r() has failed at least once for unknown reason. discussed with djm - - OpenBSD-Commit-ID: 68f4c92d46b2578d4594b0ed940958d597fd61ac - -commit a06d2d823ec1fa3784b0e17d4c4f37c26f723fd0 -Author: Chris Rapier -Date: Tue Aug 12 17:29:55 2025 -0400 - - Whitespace typo on line 19 in c-cpp.yml - -commit 3e6d0b6fec1a43830c1a2c4593d8b56e6c86ce54 -Author: Chris Rapier -Date: Tue Aug 12 17:27:57 2025 -0400 - - Neglected to update cifuzz.yml, github-repo-stats.yml, and FUNDING.yml - -commit 40b5261926c31e1c78fca582b4bb6497597868b1 -Author: Chris Rapier -Date: Tue Aug 12 17:24:46 2025 -0400 - - Revised CI files resolve prior failures. - - Something changed in the CI system and a lot of tests run against - Ubuntu 24.04/latest were failing. This turned out to be an issue - with the CI files. I pulled a new copy from OpenSSH and they seem to - work now, - -commit 314144316a46cff915826ad7b4121f9c419045fd -Author: Chris Rapier -Date: Tue Aug 12 16:12:28 2025 -0400 - - Starting over from scratch with the latest CI tests from OpenSSH - -commit 2ffc4d7bcbdb071a4cc616c784bcd968436eee9e -Author: Chris Rapier -Date: Tue Aug 12 15:57:48 2025 -0400 - - Might have been a whitespace error on line 168 - -commit b541cccaff68175525a172235b344cf7efe772e7 -Author: Chris Rapier -Date: Tue Aug 12 15:55:33 2025 -0400 - - Hunting down a typo on line 21. - Not sure what the issue is. - -commit e021e230756858f55030290192d2818c4be810b0 -Author: Chris Rapier -Date: Tue Aug 12 15:51:00 2025 -0400 - - Had tabs in the workflow file. That's not allowed - -commit 6bca5a385e3e9535e789107bbda49cca6330c565 -Author: Chris Rapier -Date: Tue Aug 12 15:41:59 2025 -0400 - - Trying to update the CI system. - -commit 0e1b8aa27f7c86d412c9e54ad9e2cae30d9ddab4 -Author: djm@openbsd.org -Date: Mon Aug 11 10:55:38 2025 +0000 - - upstream: ssh(1): add a warning when the connection negotiates a - - non-post quantum safe key agreement algorithm. - - Controlled via a new WarnWeakCrypto ssh_config option, defaulting - to on. This option might grow additional weak crypto warnings in - the future. - - More details at https://openssh.com/pq.html - - mostly by deraadt@ feedback dtucker@ ok deraadt@ - - OpenBSD-Commit-ID: 974ff243a1eccceac6a1a9d8fab3bcc89d74a2a4 - -commit 2ebc6384258b58ace0ad2adb2593744f62749235 -Author: djm@openbsd.org -Date: Wed Aug 6 23:44:09 2025 +0000 - - upstream: all state related to the ssh connection should live in - - struct ssh or struct packet_state; one static int escaped this rule, so move - it to struct packet_state now. - - ok millert tb - - OpenBSD-Commit-ID: bd6737168bf61a836ffbdc99ee4803468db90a53 - -commit 60b909fb110f77c1ffd15cceb5d09b8e3f79b27e -Author: dtucker@openbsd.org -Date: Wed Aug 6 11:22:53 2025 +0000 - - upstream: Improve sentence. ok djm@ - - OpenBSD-Commit-ID: 9c481ddd6bad110af7e530ba90db41f6d5fe2273 - -commit 9ffa98111dbe53bf86d07da8e01ded8c5c25456b -Author: djm@openbsd.org -Date: Wed Aug 6 04:53:04 2025 +0000 - - upstream: when refusing a certificate for user authentication, log - - enough information to identify the certificate in addition to the reason why - it was being denied. Makes debugging certificate authz problems a bit easier. - - ok dlg@ - - OpenBSD-Commit-ID: 4c4621b2e70412754b3fe7540af8f4bf02b722b1 - -commit 2a31009c36eb2da412c2784fe131fcb6ba800978 -Author: job@openbsd.org -Date: Tue Aug 5 09:08:16 2025 +0000 - - upstream: Use the operating system default DSCP marking for - - non-interactive traffic - - It seems the CS1 traffic class mark is considered ambiguous and therefore - somewhat unhelpful (see RFC 8622 for more considerations). But, the new - 'LE' scavenger class (also proposed in RFC 8622) offers high probability - of excessive delays & high packet loss, which would be inappropriate - for use with, for example, X11 forwardings. In fact, it is not known to - SSH what's appropriate because SSH is not aware of the content of what - passing through session forwardings. Therefore, no marking is appropriate. - Non-interactive traffic simply is best effort. - - OK djm@ deraadt@ - - OpenBSD-Commit-ID: db1da1a432ecd53fc28feb84287aedb6bec80b01 - -commit 6ebd472c391a73574abe02771712d407c48e130d -Author: djm@openbsd.org -Date: Tue Aug 5 04:00:15 2025 +0000 - - upstream: a bunch of the protocol extensions we support now have RFCs - - and I-Ds that are more complete and detailed than what we have in the - PROTOCOL.* files. Refer to these when possible instead of documenting them - here. - - OpenBSD-Commit-ID: 4fa5b0fcf5d5f24093d33d9e82c7ca4850d50d70 - -commit ec3465f59c651405e395092f3ad606f8992328d8 -Author: job@openbsd.org -Date: Thu Jul 31 11:23:39 2025 +0000 - - upstream: Deprecate support for IPv4 type-of-service (TOS) IPQoS - - keywords - - Type of Service (ToS) was deprecated in the late nineties and replaced - with the Differentiated Services architecture. Diffserv has significant - advantages for operators because this mechanism offers more granularity. - - OpenSSH switched its default IPQoS from ToS to DSCP values in 2018. - - IPQoS configurations with 'lowdelay', 'reliability', or 'throughput' will be - ignored and instead the system default QoS settings apply. Additionally, a - debug message is logged about the deprecation with a suggestion to use DSCP. - - with/OK deraadt@ sthen@ djm@ - - OpenBSD-Commit-ID: 40c8c0c5cb20151a348728703536af2ec1c754ba - -commit 65909fa114e7dd7511800db2b7bacb8774afe887 -Author: job@openbsd.org -Date: Thu Jul 31 09:38:41 2025 +0000 - - upstream: Set default IPQoS for interactive sessions to Expedited - - Forwarding (EF) - - Marking interactive session data with DSCP value EF (RFC3246, RFC3247) - helps inform the network on relative priority compared to other traffic. - This is especially useful for differentiated treatment over wireless media. - - Following the reconciled IETF Diffserv to IEEE 802.11 mappings (RFC 8325), - traffic marked with DSCP value EF maps to User Priority 6 in QoS Control, - in turn mapping to the high priority WMM AC_VO access category. - - OK djm@ - - OpenBSD-Commit-ID: aadda7b9da794d70d7c6b381a861a0610afce1b3 - -commit 8ea78abd81e8eb2be94c522a8258f4d44b58b6da -Author: Chris Rapier -Date: Mon Aug 4 16:30:57 2025 -0400 - - Test - -commit cb988e646e0f5edac307732721ae74c755b72334 -Author: Chris Rapier -Date: Mon Aug 4 16:29:20 2025 -0400 - - Test - -commit d1c6c67a50fc957010fa027c6ab970424e9b9142 -Author: Darren Tucker -Date: Sat Aug 2 14:49:00 2025 +1000 - - Disable security key tests for bigendian interop - -commit e85248df3f1073343da87a6b00512e6a1e4a863d -Author: Darren Tucker -Date: Sat Aug 2 12:51:42 2025 +1000 - - Comment out atime restore test. - - This works on filesystems mounted 'noatime', but on others the stat() - resets atime causing the test to fail. - -commit b1c4cedbee107dc611ce091f27ea9f1de28ee378 -Author: Darren Tucker -Date: Fri Aug 1 19:29:00 2025 +1000 - - Replace fbsd64ppc VM with physical host. - - Run 64bit bigendian interop test on NetBSD arm64be instead. - -commit 284abbed9a8d815b1ec5e96aff885d77e26537e7 -Author: dtucker@openbsd.org -Date: Wed Jul 30 10:17:13 2025 +0000 - - upstream: Plug leak in case where sigp is passed as NULL. Coverity CID - - 483725, ok djm@ - - OpenBSD-Commit-ID: 47cf7b399c84e102b670b9f97ab6926c9a7256b5 - -commit dc630e6d81be8aa495254839731e4f3521cf9e31 -Author: djm@openbsd.org -Date: Wed Jul 30 04:27:42 2025 +0000 - - upstream: unbreak WITH_OPENSSL=no builds, also allowing ed25519 - - keys to be used via PKCS#11 when OpenSSH is built without libcrypto. - - OpenBSD-Commit-ID: ecf26fdf7591bf2c98bac5136fbc36e0b59c3fc2 - -commit a5bec2cdfc4f38ddb6211809851aae29ba99a35a -Author: djm@openbsd.org -Date: Wed Jul 30 04:19:17 2025 +0000 - - upstream: fix variable name in disabled code - - OpenBSD-Commit-ID: 5612e979575d5da933c8b720d296423fd84392f5 - -commit af892368c8d61109303f23019550fbc5a4517b48 -Merge: acd4634fa e97b21de4 -Author: Chris Rapier -Date: Tue Jul 29 15:54:35 2025 -0400 - - Added HappyDelay option. - - This is a runtime option to specify the delay between - starting the IPv6 connection and the IPv4 connection. - The default is 250ms as per RFC 8305. This must be a - positive integer. 0 or negative values will be rewritten - to a value of 1ms. - - Updated documentation to include HappyEye options. - -commit acd4634fabc8431e31b0630ea0c8b29ca230eefd -Author: Chris Rapier -Date: Tue Jul 29 13:57:54 2025 -0400 - - Happy Eyeballs was being hammered by IPQoS defaults - - The default IPQoS for SSH had changed from - interactive = lowdelay - bulk = throughput - to - interactive = af21 - bulk = cs1 - - The result of this being that in test scenarios, where we used - tc qdisc to insert delay on IPv6, the IPv4 connections ended up - having the same effective delay as the IPv6. This meant that we'd - always end up using the IPv6 connection even though IPv4 was - not being delayed. I don't really understand DSCP enough to undertand - why this is happening but this might be a test artifact. In any case, - being that both IPv4 and IPv6 had the same effective delay the IPv6 - connection would always end up winning the race because of the - 250ms pause between the IPv6 and IPv4 attempts. - - This commit stil lhas too many debug statements in it but - it works for testing. - -commit 5e4bfe6c16924b1c21a733f3e218cfcba98e301e -Author: Damien Miller -Date: Sat Jul 26 19:19:46 2025 +1000 - - more ec/ed25519 fixing - -commit 2603098959eff55cbe188c3dfcbe5302808a80fc -Author: Damien Miller -Date: Sat Jul 26 14:27:53 2025 +1000 - - repair build for libcrypto without ed25519 support - -commit a729163c56ecc002c0cb04db56e7d86ceec2e8b0 -Author: djm@openbsd.org -Date: Sat Jul 26 01:53:31 2025 +0000 - - upstream: regression tests for Ed25519 keys in PKCS#11 tokens - - OpenBSD-Regress-ID: 50067c0716abfea3a526b4a0c8f1fe15e7665c0f - -commit 361ff0ca308ac02449e71689fc5ea72114db43db -Author: djm@openbsd.org -Date: Sat Jul 26 01:51:44 2025 +0000 - - upstream: Support ed25519 keys hosted on PKCS#11 tokens. - - Tested on Yubikeys and against SoftHSM2. - - feedback/ok tb@ - - OpenBSD-Commit-ID: 90ddb6529f2e12e98e8bba21d8592e60579ce2e4 - -commit 2b530cc3005a71c5ba6b712978872fc9c147439c -Author: djm@openbsd.org -Date: Fri Jul 25 13:06:07 2025 +0000 - - upstream: update our PKCS#11 API header to v3.0; - - feedback/ok tb@ - - OpenBSD-Commit-ID: e67fa6a26e515c2b1fb7b0d1519d138aafb3e017 - -commit e97b21de4a46b644c8bf81fe2f3dcbe3b76d3d6f -Author: Chris Rapier -Date: Fri Jul 25 16:03:59 2025 -0400 - - checkpoint - -commit dad70e503a51f1511576bcc05e419dea989696f1 -Author: Chris Rapier -Date: Fri Jul 25 13:24:37 2025 -0400 - - Checkpoint - -commit 550d2a4a66c50f7641563a63b900761d99efb24a -Author: Damien Miller -Date: Fri Jul 25 23:04:33 2025 +1000 - - another attempt at fixing !EC builds - -commit ed1e370d84e9dc39bc31c19cca12222d991fdc6f -Author: dtucker@openbsd.org -Date: Fri Jul 25 11:50:45 2025 +0000 - - upstream: Don't snprintf a NULL since not all platforms support it. - - OpenBSD-Commit-ID: 6e0c268e40047e96fab6bc56dc340580b537183b - -commit eedab8db12d57c4f4583f6b60e48a4ce25b47b9c -Author: Damien Miller -Date: Fri Jul 25 16:21:43 2025 +1000 - - unbreak !EC builds - -commit 203f5ac6cfa0e257db7509d4bb830e8a4bba6211 -Author: djm@openbsd.org -Date: Thu Jul 24 06:04:47 2025 +0000 - - upstream: test code now needs to link ssh-pkcs11-client.c any time - - sshkey.c is included - - OpenBSD-Regress-ID: 9d07188eae9a96801c3150b3433bb220626d4443 - -commit 33b4f05c8ddab24aa6c47afb313b8cbd0d4b77f4 -Author: Damien Miller -Date: Fri Jul 25 12:47:17 2025 +1000 - - update clang-16 -> clang-19 - -commit 03e9e993ef1ef5accc6457152278cab5988f9b3d -Author: Damien Miller -Date: Fri Jul 25 12:46:59 2025 +1000 - - include ssh-pkcs11-client.o as common dep - -commit 2f5269938a8e4769f484c9d45419a86529078ede -Author: Damien Miller -Date: Fri Jul 25 12:46:10 2025 +1000 - - remove vestigial stub - -commit bf33a73c40522ce60961d4fff316a7187fb06ca0 -Author: djm@openbsd.org -Date: Thu Jul 24 23:27:04 2025 +0000 - - upstream: this should include stdlib.h explicitly - - OpenBSD-Commit-ID: 1c0cc5c3838344b33ae4ab7aa62c01530357bf29 - -commit 9f8ccc3b81b53324cc489f3fe00f03c329c0acb2 -Author: djm@openbsd.org -Date: Thu Jul 24 06:59:51 2025 +0000 - - upstream: less stale reference to PKCS#1 1.5 hash OIDs; feedback - - from tb@ - - OpenBSD-Commit-ID: 9fda77978491a130a7b77d87d40c79277b796721 - -commit 1641ab8744f500f55f12155d03f1a3116aaea374 -Author: djm@openbsd.org -Date: Thu Jul 24 06:12:08 2025 +0000 - - upstream: factor out encoding of a raw ed25519 signature into its - - ssh form into a separate function - - OpenBSD-Commit-ID: 3711c6d6b52dde0bd1f17884da5cddb8716f1b64 - -commit a8c0e5c871c0c7ee5ae93e353b1499a53c09c71d -Author: djm@openbsd.org -Date: Thu Jul 24 05:44:55 2025 +0000 - - upstream: Help OpenSSH's PKCS#11 support kick its meth habit. - - The PKCS#11 code in OpenSSH used the libcrypto public key method API - (e.g. the delightfully named RSA_meth_free()) to delegate signing - operations to external keys. This had one advantage - that it was - basically transparent to callers, but also had a big disadvantage - - that we'd manually have to track the method implementations, their - state and their relationships to the underlying PKCS#11 objects. - - This rips this out and replaces it with explicit delegation to - PKCS#11 code for externally hosted keys via the ssh-pkcs11-helper - subprocess. This is very similar to how we handle FIDO keys in - OpenSSH (i.e. via ssh-sk-helper). All we need to track now is a - much simpler mapping of public key -> helper subprocess. - - Kicking our libcrypto meth dependency also makes it much easier - to support Ed25519 keys in PKCS#11, which will happen in a subsequent - commit. - - feedback / ok tb@ - - OpenBSD-Commit-ID: a5a1eaf57971cf15e0cdc5a513e313541c8a35f0 - -commit 89b88357b88e9913c2ca03f0d5b9c5ccab5935e1 -Author: Chris Rapier -Date: Thu Jul 24 12:12:40 2025 -0400 - - Checkpoint - -commit 259c66aebe4e1f9d60e548f728ff74083bcccddf -Author: Darren Tucker -Date: Thu Jul 24 22:02:49 2025 +1000 - - Remove DEBUG_ACTIONS variable. - - If needed it can be set in github if needed. - -commit 40fb2dc4ece76c8f0c624d90a17bc1bbf47f3729 -Author: djm@openbsd.org -Date: Wed Jul 23 05:07:19 2025 +0000 - - upstream: add a ssh_config RefuseConnection option that, when - - encountered while processing an active section in a configuration file, - terminates ssh(1) with an error message that contains the argument to the - option. - - This may be useful for expressing reminders or warnings in config - files, for example: - - Match host foo - RefuseConnection "foo is deprecated, use splork instead" - - ok djg - - OpenBSD-Commit-ID: 5b0072fcd08ad3932ab21e27bbaa66b008d44237 - -commit defc806574d2256036d69a291caf0f3484844de6 -Author: miod@openbsd.org -Date: Sat Jul 12 05:28:33 2025 +0000 - - upstream: Add missing inter-library dependencies to LDADD and - - DPADD. ok tb@ deraadt@ - - OpenBSD-Commit-ID: a05e13a7e2c0b65bb4b47184fef731243431c6ff - -commit e6805e2a6b33e001e1a7257b85ab779fd592a578 -Author: Jan Tojnar -Date: Thu May 18 16:30:35 2023 +0200 - - Add gnome-ssh-askpass4 for GNOME 40+ - - GTK 3 has been in maintenance mode for a while now, and it is on the road - to being abandoned. As a result, the dialogue looks out of place on modern - systems. - - We could port it to GTK 4 but without the program being registered as an - application (i.e. having a .desktop file), GNOME Shell would ask for - permission to grab input every time. - - Let’s instead use the GNOME Shell’s native prompt through the unstable - Gcr API. - -commit f9dc519259804702cab0fa0ca8b193a360e3ec38 -Author: Damien Miller -Date: Fri Jul 11 17:20:27 2025 -0700 - - let ga_init() fail gracefully if getgrouplist does - - Apparently getgrouplist() can fail on OSX for when passed a non-existent - group name. Other platforms seem to return a group list consisting of - the numeric gid passed to the function. - - This makes ga_init() handle this failure case gracefully, where it will - return success but with an empty group list array. - - bz3848; ok dtucker@ - -commit f01a899b92ab8c5e6ff71214658bd09636c47e87 -Author: djm@openbsd.org -Date: Fri Jul 11 23:26:59 2025 +0000 - - upstream: add a "Match Group NoSuchGroup" to exercise groupaccess.c - - OpenBSD-Regress-ID: 7ff58e6f0eb21eb9064dd0cfa78c3b6f34b5f713 - -commit 1052fa62b35e0bb25b0c1efb9fdd7870e4a68ab6 -Author: Damien Miller -Date: Fri Jul 11 15:36:49 2025 -0700 - - more diagnostics when getgrouplist fails - -commit eddd1d2daa64a6ab1a915ca88436fa41aede44d4 -Author: djm@openbsd.org -Date: Fri Jul 4 09:51:01 2025 +0000 - - upstream: Fix mistracking of MaxStartups process exits in some - - situations. At worst, this can cause all MaxStartups slots to fill and sshd - to refuse new connections. - - Diagnosis by xnor; ok dtucker@ - - OpenBSD-Commit-ID: 10273033055552557196730f898ed6308b36a78d - -commit c971f3d93efe4c00d73b276cdbab66e7c66c9b5c -Author: Darren Tucker -Date: Sat Jul 5 20:50:50 2025 +1000 - - Add include for gssapi definitions. - - Patch from dbelyavs at redhat.com via bz#3846. - -commit 007b69f21cf9e64125b241d4411a5e47f5028aa8 -Author: djm@openbsd.org -Date: Fri Jul 4 07:52:17 2025 +0000 - - upstream: add a regress test for configurations > 256KB - - mostly by Dmitry Belyavskiy - - OpenBSD-Regress-ID: fcedb249e4cf2447e078a839877f99730ee79024 - -commit 0cf38d74463bcf80510e7fd1b3d9328e7d91eb00 -Author: djm@openbsd.org -Date: Fri Jul 4 07:47:35 2025 +0000 - - upstream: the messaging layer between sshd-session and sshd-auth had a - - maximum message size of 256KB. Some people apparently have configurations - larger than this and would hit this limit. - - Worse, there was no good logging that could help diagnose what was - going wrong. - - So this bumps the maximum message size to 4MB and implements an early - check (usable via the sshd -t test mode) that will report it to the - user where it is hopefully more visible. - - bz3808, reported by Dmitry Belyavskiy, ok dtucker@ - - OpenBSD-Commit-ID: 69c303fb68cbd1a4735936835d67a71e7b57f63b - -commit fd10cea0f16e928ae2b52fbeadccd475d0438eb4 -Author: djm@openbsd.org -Date: Fri Jul 4 00:17:55 2025 +0000 - - upstream: mux: fix incorrect return value check in local forward - - cancellation - - channel_cancel_lport_listener() returns 1 on success and 0 on failure. - The previous code incorrectly checked for `== -1`, a value the function - never returns, so failure was not detected and the "port not found" - error message was never shown when cancelling dynamic or local port - forwards. - - From: Boris Tonofa - - OpenBSD-Commit-ID: 3e9d2252a4d0bd318d4f25e2b518afb44acea170 - -commit 29cf521486bf97ab9de5b9b356f812107e0671bc -Author: Damien Miller -Date: Wed Jul 2 13:47:38 2025 +1000 - - wrap some autoconf macros in AC_CACHE_CHECK - - This allows skipping/overriding the OSSH_CHECK_CFLAG_COMPILE and - OSSH_CHECK_CFLAG_LINK macros used to discover supported compiler - or linker flags. E.g. - - $ ./configure ossh_cv_cflag__fzero_call_used_regs_used=no - [...] - checking if cc supports compile flag -ftrapv and linking succeeds... yes - checking if cc supports compile flag -fzero-call-used-regs=used and linking succeeds... (cached) no - checking if cc supports compile flag -ftrivial-auto-var-init=zero... yes - - Patch from Colin Watson, ok dtucker@ - -commit b28e91aff80fd24341de8cb3c34dc454d6b75228 -Author: dtucker@openbsd.org -Date: Sun Jun 29 08:20:21 2025 +0000 - - upstream: Add shebang path to askpass script. Required for exec on - - some platforms (musl, probably others). - - OpenBSD-Regress-ID: 35cdeed12ae701afcb812f800c04d817325cd22a - -commit 83d3ffc0fc0f5e4473ab43f0d42a1cf9497ce0b5 -Author: dtucker@openbsd.org -Date: Sun Jun 29 05:35:00 2025 +0000 - - upstream: Check dropbear server version for required features. - - Dropbear added the '-D' flag in version 2025.87. We need that for the - dropbear-server test, so skip on older versions. - - OpenBSD-Regress-ID: 9db0b84edd54d3c00ab17db1dc6d62af4644c550 - -commit 0b17d564cfae82f2a52e9b4d588657da47ea4e43 -Author: Darren Tucker -Date: Sun Jun 29 14:34:48 2025 +1000 - - Encrypt temporary password we're setting. - - Now that we want to actually use the random password for tests, we need - to correctly encrypt it, instead of just setting it to a random string - that's not the "locked" value. - -commit 700205bd861c25cc7564010cf63d984d8db5098a -Author: Darren Tucker -Date: Sun Jun 29 11:27:17 2025 +1000 - - Fix env again. - -commit 223a1beac7b7be9252f69055781c9c15f4d8a607 -Author: Darren Tucker -Date: Sun Jun 29 11:24:42 2025 +1000 - - Move env again. - -commit d32614b448528ac08a65caac323a34b4f559a204 -Author: Darren Tucker -Date: Sun Jun 29 11:22:00 2025 +1000 - - Move env to where it (hopefully) belongs. - -commit 8a9384de483b8fb69a800e0347273686a5715fc3 -Author: Darren Tucker -Date: Sun Jun 29 11:14:18 2025 +1000 - - Enable password tests on Github ephemeral VMs. - -commit bcfe7340d9b622ecd978c87dbf885c8b5a503ca2 -Author: dtucker@openbsd.org -Date: Sat Jun 28 13:34:08 2025 +0000 - - upstream: Add simple regression test for dropbear as a server. - - OpenBSD-Regress-ID: 7abe1f6607d0cd49839918aade8f135d2462d389 - -commit 838d5ec4b12fb519ed9db76e5beccf11b7ee212f -Author: dtucker@openbsd.org -Date: Tue Jun 24 12:28:23 2025 +0000 - - upstream: Add simple test for password auth. Requires some setup - - so does not run by default. - - OpenBSD-Regress-ID: d5ded47a266b031fc91f99882f07161ab6d1bb70 - -commit 57fb460165ae3b2d591f2468d7fe13cc1abda26d -Author: djm@openbsd.org -Date: Tue Jun 17 01:24:32 2025 +0000 - - upstream: add RCS ID - - OpenBSD-Regress-ID: 6e30094e3bf0a1c65efb75c67a87093304a3e619 - -commit 688fa02728f2efbf18388bc1a8e94e7ba7ee4f11 -Author: djm@openbsd.org -Date: Tue Jun 24 09:22:03 2025 +0000 - - upstream: make "Match !final" not trigger a 2nd pass ssh_config - - parsing pass (unless hostname canonicalisation or a separate "Match final" - does). bz3843 - - ok dtucker@ - - OpenBSD-Commit-ID: ce82b6034828888f0f3f1c812e08f5e87400d802 - -commit 5ba8391d697740a838fd8811434f707f0e079baa -Author: djm@openbsd.org -Date: Thu Jun 19 05:49:05 2025 +0000 - - upstream: better debug diagnostics when loading keys. Will now list - - key fingerprint and algorithm (not just algorithm number) as well as making - it explicit which keys didn't load. - - OpenBSD-Commit-ID: ee3e77a0271ab502e653922c6d161b1e091f8fee - -commit b360f3a675e24b0dbb2ec30d985e3b6756996c0d -Author: djm@openbsd.org -Date: Tue Jun 17 01:20:17 2025 +0000 - - upstream: whitespace - - OpenBSD-Commit-ID: 6e96814bcf70d0edbb0749ec61cc4fd8707f286d - -commit ad38ec5f1b6768944d64ed7709da8706538b5509 -Author: djm@openbsd.org -Date: Tue Jun 17 01:19:27 2025 +0000 - - upstream: fix leak on error path; Coverity CID 481976 - - OpenBSD-Commit-ID: 963dba2c804e2fd8efea2256092899874d0dbc7b - -commit 5f761cdb2331a12318bde24db5ca84ee144a51d1 -Author: Darren Tucker -Date: Tue Jun 17 21:46:37 2025 +1000 - - Update obsd tests to use current images. - -commit 1e8347e3543a415067ccc556aefea97656ecafb7 -Author: Damien Miller -Date: Tue Jun 17 09:48:47 2025 +1000 - - add sshd-auth to RPM spec files - -commit dd800444943bd64913507f6005586136d49f63db -Author: dtucker@openbsd.org -Date: Mon Jun 16 09:09:42 2025 +0000 - - upstream: Limit each moduli size to a max of 100 entries. - - OpenBSD-Commit-ID: 747219d54565030ff7c45298b9f5e971801f6cb2 - -commit 05f7bf46d1e2c101e9cbdd3df2ccee484bed969f -Author: dtucker@openbsd.org -Date: Mon Jun 16 09:07:08 2025 +0000 - - upstream: Now that ssh-keygen defaults to the maximum memory for - - moduli generation we no longer need to run it twice to get enough. Use mkdir - -p instead of a conditional, which allows "make -jN" to work without error. - - OpenBSD-Commit-ID: c2eb57285424f819f9520fa33e0d6d3c4a361a5e - -commit df3f903d616763a105570610a616dacf0f83438e -Author: dtucker@openbsd.org -Date: Mon Jun 16 09:02:19 2025 +0000 - - upstream: Fix overflow check in sshbuf_dup_string. It's already - - constrained by SSHBUF_SIZE_MAX, but still worth fixing the check. Patch from - afonot via github PR#573, with & ok djm@ - - OpenBSD-Commit-ID: 438888498e66472fc6a48133196d6538d27bff18 - -commit 80916d0d3794e2f92dd6998d7c45daba484e4f18 -Author: dtucker@openbsd.org -Date: Mon Jun 16 08:53:04 2025 +0000 - - upstream: Plug mem leak. Patch from afonot via github PR#574, ok djm@ - - OpenBSD-Commit-ID: 65619f14ef206028ce39bc31f704b832a0609688 - -commit bd1bd7e8296aa51a4b3958cef2fbb17894ba94e9 -Author: dtucker@openbsd.org -Date: Mon Jun 16 08:49:27 2025 +0000 - - upstream: Save return value from sshbuf_len instead of calling it - - multiple times. Fixes Coverity CID 470521. - - OpenBSD-Regress-ID: 356b8b43c8a232deaf445c1ff7526577b177a8e9 - -commit 2827b6ac304ded8f99e8fbc12e7299133fadb2c2 -Author: dtucker@openbsd.org -Date: Fri Jun 13 07:35:14 2025 +0000 - - upstream: Plug leak. Coverity CID 405058. - - OpenBSD-Regress-ID: 7fb2fce68d2cb063cdb94d5d66f84fa3a2902792 - -commit 9cdc72b829e9f0e24dedc533cbe87291d8a88c9e -Author: dtucker@openbsd.org -Date: Fri Jun 13 07:23:07 2025 +0000 - - upstream: Remove dead code flagged by Coverity CID 307783. ok djm@ - - OpenBSD-Regress-ID: e579f5ec2fd2eb2fe2bad654d16f2ba655a3e035 - -commit 930a45ee759728c8ba711c45a2a985b8191bd297 -Author: dtucker@openbsd.org -Date: Thu Jun 12 10:09:39 2025 +0000 - - upstream: Set user, host and path to NULL immediately before calling - - parse_user_host_path in tests. This ensures that we don't accidentally use - the previous value if the function under test doesn't set them Also fixes - Coverity CIDs 405056 405065 405066. - - OpenBSD-Regress-ID: 43678ff59001712f32214fe303b1c21c163c2960 - -commit 2314d87f9b8b430532111fd6e5e8df0cf9068c9c -Author: dtucker@openbsd.org -Date: Thu Jun 12 09:26:57 2025 +0000 - - upstream: Plug mem leak on error path here too. - - Coverity CID 307781. - - OpenBSD-Regress-ID: 18e053d9b661fbb4227d3db03172077c1216bb2e - -commit 567ef4e7ddc5c1e7a461560963a1dc759669821d -Author: dtucker@openbsd.org -Date: Thu Jun 12 09:19:43 2025 +0000 - - upstream: Plug mem leak on error path. - - Coverity CID 307776. - - OpenBSD-Regress-ID: c44246690973e1b8643e51079a2faa7ace26490c - -commit 5bed099db6051a03b6f9dea6110658cea97b5867 -Author: Chris Rapier -Date: Wed Jun 11 17:11:50 2025 -0400 - - Comments in happyeyeballs.c - -commit 5d415897ac04e237f1fa73b9dcb9ba8fb3ac812b -Author: dtucker@openbsd.org -Date: Wed Jun 11 13:27:11 2025 +0000 - - upstream: Remove dead code ternary. We always report at least - - KB/s, so B/s is never used. Coverity CID 291809, ok djm@ - - OpenBSD-Commit-ID: a67c5bcc9e19c8965bfeace0e337b13660efa058 - -commit 4b3d27032ba88dd089b721f3bbe3e4a8d23b4ae1 -Author: dtucker@openbsd.org -Date: Wed Jun 11 13:24:05 2025 +0000 - - upstream: Improve termination condition of while loop to compare - - size_t's. Assuming read() does what it's supposed to this shouldn't matter, - but should be more robust. Flagged by Coverity CID 470514, ok djm@ - - OpenBSD-Commit-ID: d7b5ad60feb797b3464964b9ea67fd78fb9d6cc6 - -commit 5530e5f83b3cd3425ea3dbab02da15140befdd91 -Author: Darren Tucker -Date: Tue Jun 10 18:40:56 2025 +1000 - - Replace Windows 2019 runners with 2025 ones. - - The windows-2019 runners are being decomissioned. - -commit a22ff3c6f11edd00c19981f9cb85d3b25d305a56 -Author: Darren Tucker -Date: Wed Jun 4 18:33:52 2025 +1000 - - Disable _FORTIFY_SOURCE during snprintf test. - - Prevents mistakenly detecting snprintf as broken on FreeBSD 15 with - _FORTIFY_SOURCE enabled. bz#3809, patch from jlduran at gmail.com - -commit 203bb886797677aa5d61b57be83cfdc1b634bc9c -Author: dtucker@openbsd.org -Date: Mon Jun 2 14:09:34 2025 +0000 - - upstream: Fix x11_channel_used_recently() to return true when channel - - has been used within the last second, instead of more than a second ago. - Should fix ~5s delay on X client startup when ObscureKeystrokeTiming is - enabled. bz#3820, ok (& sigh) djm@ - - OpenBSD-Commit-ID: b741011e81fb3e3d42711d9bd3ed8a959924dee4 - -commit dc6c134b48ba4bcfadedcea17b4eddac329601d9 -Author: dtucker@openbsd.org -Date: Thu May 29 13:27:27 2025 +0000 - - upstream: When there's more than one x11 channel in use, return - - lastused of most recently used x11 channel instead of the last one found. ok - djm@ - - OpenBSD-Commit-ID: 94a72bf988d40a5bae2e38608f4e117f712569fe - -commit 73ef0563a59f90324f8426c017f38e20341b555f -Author: djm@openbsd.org -Date: Sat May 24 11:41:51 2025 +0000 - - upstream: replace xmalloc+memset(0) with xcalloc(); from AZero13 via - - GHPR417 - - OpenBSD-Commit-ID: 921079436a4900325d22bd3b6a90c8d0d54f62f8 - -commit 3a61f5ed66231881bee432c7e7c6add066c086af -Author: djm@openbsd.org -Date: Sat May 24 09:46:16 2025 +0000 - - upstream: fix punctuation around host key fingerprints to make them - - easier to copy and paste. - - Patch from Till Maas via GHPR556; ok dtucker@ - - OpenBSD-Commit-ID: c0100182a30b6925c8cdb2225b18140264594b7b - -commit b12d4ab1e16f57c6c348b483b1dbdd4530aaaddd -Author: dtucker@openbsd.org -Date: Sat May 24 08:13:29 2025 +0000 - - upstream: Replace strncmp + byte count with strprefix in Penalty - - config parsing. ok kn@, djm@ - - OpenBSD-Commit-ID: 34a41bb1b9ba37fb6c7eb29a7ea909547bf02a5a - -commit a356d978e30dd9870c0b3a7d8edca535b0cd2809 -Author: dtucker@openbsd.org -Date: Sat May 24 08:09:32 2025 +0000 - - upstream: Make the display number check relative to - - X11DisplayOffset. - - This will allows people to use X11DisplayOffset to configure much higher - port ranges if they really want, while not changing the default behaviour. - Patch from Roman Gubarev via github PR#559, ok djm@ - - OpenBSD-Commit-ID: e0926af5dc0c11e364452b624c3ad0cda88550b5 - -commit e18983d03ab969e2f12485d5c0ee61e6d745a649 -Author: Darren Tucker -Date: Sat May 24 17:20:57 2025 +1000 - - Remove progressmeter.o from libssh.a. - - It's now explicitly included by the binaries that need it (scp & sftp). - bz#3810, patch from jlduran at gmail.com - -commit f8967045ad9d588bc11426642070bf8549065e62 -Author: dtucker@openbsd.org -Date: Sat May 24 06:50:28 2025 +0000 - - upstream: Null out keys between test runs. - - BENCH_START and BENCH_FINISH are actually a while() loop in disguise, - so if sshkey_generate does not reset the key pointer on failure the test - may incorrectly pass. It also confuses Coverity (CID 551234). - - OpenBSD-Regress-ID: bf4d32079fc6df6dce1f26c2025f4ed492f13936 - -commit a26091ecdb2a3d72b77baf3c253e676a3c835a24 -Author: djm@openbsd.org -Date: Sat May 24 04:41:12 2025 +0000 - - upstream: add some verbosity - - OpenBSD-Regress-ID: 11c86cda4435b5f9ab6172c4742b95899666c977 - -commit 484563ec70e30472ab4484d49bca9a83771d785c -Author: djm@openbsd.org -Date: Sat May 24 04:41:03 2025 +0000 - - upstream: use start_ssh_agent() to ensure we get logging - - add some verbosity - - OpenBSD-Regress-ID: a89bf64696b9fb1b91be318e6b8940c9ab21c616 - -commit e3c58113ebb3397b252ff26e0e94f726b7db7a8a -Author: djm@openbsd.org -Date: Sat May 24 04:40:37 2025 +0000 - - upstream: add a start_ssh_agent() function that sets up an agent - - with logging - - OpenBSD-Regress-ID: 7f9f30f9c64acbd4b418a5e1a19140cc988071a8 - -commit 3de011ef7a761751afe28ac7ef97fe330d784595 -Author: dtucker@openbsd.org -Date: Sat May 24 06:43:37 2025 +0000 - - upstream: Plug leak of startup_pollfd in debug and child paths. - - Coverity CID 405024, ok djm@ - - OpenBSD-Commit-ID: db46047229253e9c4470c8bbf5f82706ac021377 - -commit d0245389bc55f16082cadd0a39dda5af1c415dfa -Author: Darren Tucker -Date: Sat May 24 17:11:38 2025 +1000 - - ssh-keygen changes were fixup'ed into single commit. - -commit 140bae1df2b7246bb43439d039bf994159973585 -Author: Marco Trevisan (Treviño) -Date: Mon Sep 30 13:14:11 2024 +0200 - - auth-pam: Check the user didn't change during PAM transaction - - PAM modules can change the user during their execution, in such case ssh - would still use the user that has been provided giving potentially - access to another user with the credentials of another one. - - So prevent this to happen, by ensuring that the final PAM user is - matching the one that initiated the transaction. - -commit 216824172724a50a4a75439fb2b4b8edccf5b733 -Author: dtucker@openbsd.org -Date: Sat May 24 03:37:40 2025 +0000 - - upstream: Remove ssh-keygen's moduli screen -Omemory option. - - This vaguely made sense 20 years ago, but these days you'd be hard - pressed to *find* a machine small enough to not support the maximum - (127MB), and no one is screening moduli on such machines anyway, - so just use the max. This also fixes Coverity CID 470522 by deleting - code in question. "kill it with fire" djm@. - - OpenBSD-Commit-ID: 39036aa406a99f0a91923aa3a96afff1205558e6 - -commit f5cd14e81fa29b4924959cb2e1f9c206aae2d502 -Author: dtucker@openbsd.org -Date: Sat May 24 02:33:33 2025 +0000 - - upstream: Fix compile error on 32bit platforms. - - Spotted by & ok tb@ - - OpenBSD-Commit-ID: cbcf518247886f3c7518fc54cb3bd911ffc69db7 - -commit eccc15014fe146e8590568e6737a3097bfac3415 -Author: dtucker@openbsd.org -Date: Sat May 24 02:01:28 2025 +0000 - - upstream: Use pointer from strprefix in error message, - - missed in previous. - - OpenBSD-Commit-ID: d2cdec6cf0fcd4b0ee25e4e3fad8bc8cf0ee657d - -commit 91903511d0597c3bea218167f9ca5a176fa0dc20 -Author: dtucker@openbsd.org -Date: Fri May 23 12:52:45 2025 +0000 - - upstream: Replace strncmp and strncasecmp with hand-counting bytes - - with strprefix. nits lucas@, ok lucas@ djm@ - - OpenBSD-Commit-ID: f0888807f151ea2bdaf6fed36303ae81f259d1d4 - -commit 0c64d69e4e24a3ab06f7922ef389e7399c4dfb88 -Author: dtucker@openbsd.org -Date: Fri May 23 11:54:50 2025 +0000 - - upstream: Include stdint.h for UINT32_MAX. - - OpenBSD-Commit-ID: edc29ed67e8bd03bac729d9b4849066d1d3a8cb9 - -commit 3e11478f585408888defa56fa47e8dc6567378d0 -Author: dtucker@openbsd.org -Date: Fri May 23 11:25:35 2025 +0000 - - upstream: Ensure args to nh_update() fit within uint32, which it - - should always anyway. Placates Coverity CID 470520. While there, fix the - upstream URL. ok djm@ - - OpenBSD-Commit-ID: 2478e89fde089a49fa02f9faf6287d35959c9f92 - -commit f097d7bd07da4634c1a723d1dc4fcf56e7d0e147 -Author: dtucker@openbsd.org -Date: Fri May 23 09:26:25 2025 +0000 - - upstream: Don't leak the args list. Coverity CIDs 481569 & 481570, - - ok job@ tb@. - - OpenBSD-Commit-ID: becabcd00513d13d1435b68b7ccffa7151b72393 - -commit a4ea7f6042f25b41061a83445016a1ea4f470f7b -Author: dtucker@openbsd.org -Date: Fri May 23 08:40:13 2025 +0000 - - upstream: Explictly set LC_ALL=C on each sort invocation. - - Remove it from sshd_config (where it could be overridden by shell startup - scripts, eg on macos-15) causing random test failures. with & ok djm@ - - OpenBSD-Regress-ID: ad0a6678964784096e9a9e6d15ead36beed92f18 - -commit 7674c03caed80cb3565d14690c92068a14051967 -Author: Darren Tucker -Date: Fri May 23 16:39:18 2025 +1000 - - Allow setting LTESTS in repo variables. - -commit d8b5bd36078e5b6d78da4633f0cc9b90ffda8b50 -Author: Darren Tucker -Date: Fri May 23 16:26:20 2025 +1000 - - Rename debugging variable RUN_ONLY_TEST. - - to RUN_ONLY_TARGET_CONFIG to make it more obvious what it matches. - -commit a79a2c1190bd3124da21d9e1582dd94877c7f972 -Author: Darren Tucker -Date: Fri May 23 16:11:48 2025 +1000 - - chown regress logs before uploading. - -commit 24889a33071086b6f1f62568b0c2bd0a4955ac49 -Author: dtucker@openbsd.org -Date: Fri May 23 01:14:35 2025 +0000 - - upstream: Import regenerated moduli. - - OpenBSD-Commit-ID: 07e29dc891e29b31e03e2e5493658b4a9ac19431 - -commit 4b8bee62d72ffb3c419c9ead6c9fb1a586283868 -Author: deraadt@openbsd.org -Date: Fri May 23 00:40:45 2025 +0000 - - upstream: use "const char * const" for malloc_options here also - - OpenBSD-Commit-ID: 869715b9c7e1dd5b85efd07814e7e53f0286eea2 - -commit 6629eee21ca9d0a597a04dcac744a1ad882f912e -Author: dtucker@openbsd.org -Date: Thu May 22 12:14:19 2025 +0000 - - upstream: Adjust debug message to prevent (unsigned) integer overflow. - - Fixes Coverity CID 481110, ok djm@ - - OpenBSD-Commit-ID: 26178bf3b812707fb498ea85d076cadd1f2eb686 - -commit 7acb70e05e9977ceca7b33df84ceaea337b1efef -Author: bluhm@openbsd.org -Date: Thu May 22 04:34:18 2025 +0000 - - upstream: Fix OpenBSD RCS ID typos. from Andrius V - - OpenBSD-Regress-ID: 5c03a2ef5323969fc4978f2eec4f1a25c48c572a - -commit 24f3d646c2cefa7000aa15d534257a5dc3676457 -Merge: 99aa50a16 88052b186 -Author: Chris Rapier -Date: Thu May 22 14:37:44 2025 -0400 - - trying o fix a merge issue - -commit 99aa50a16f21d393c35932623f6a1f04825dc04f -Author: Chris Rapier -Date: Thu May 22 14:34:26 2025 -0400 - - Added copright notice and comments to happyeyeballs.[c|h] - - I also forgot to add those files to the commit. - -commit e834ed893a2dfee24798e3fbf104a239a37e62dd -Author: Chris Rapier -Date: Thu May 22 14:18:05 2025 -0400 - - Move Happy Eyeballs functions to separate file happyeyeballs.c. - - The makes the happy_eyeballs function public so we can use it elsewhere - if necessary. It also reduces the code complexity in sshconnect.c. - -commit 2b2a7a2a0d70023b439080bb2770ff36522dbea8 -Author: Darren Tucker -Date: Thu May 22 22:09:48 2025 +1000 - - Remove debug change accidentally commited. - - Fixes Coverity CID 481160. - -commit 450a8a1df1577ddbe68fe8da1fb8514d3781ef32 -Author: Darren Tucker -Date: Thu May 22 21:16:37 2025 +1000 - - Collect all of regress dir on failure. - - This may allow us to sort through its entrails and determine the cause - of some types of failures. - -commit de25e739781c4c09d20abd410f50f0a6f192dc72 -Author: Damien Miller -Date: Thu May 22 18:42:44 2025 +1000 - - minimal shims for fstatat(2)/unlinkat(2) in agent - - Add some very minimal and task-specific replacements for - fstatat(2) and unlinkat(2) in the ssh-agent socket cleanup - loop, for platforms that lack these functions. ok dtucker@ - -commit 6d192645a613aa814d51050b0458f37265b90d6c -Author: dtucker@openbsd.org -Date: Thu May 22 04:22:03 2025 +0000 - - upstream: Output the current name for PermitRootLogin's - - "prohibit-password" in sshd -T instead of its deprecated alias - "without-password". bz#3788, patch from cjwatson at debian.org. - - OpenBSD-Commit-ID: 2d5df18d5ad33a9b6c7547ec78a8e6ea13813df9 - -commit 1ccf42378df202472e7254f37f7dabb2f5723955 -Author: dtucker@openbsd.org -Date: Thu May 22 03:53:46 2025 +0000 - - upstream: Copy arg to be passed to dirname(). - - POSIX allows dirname() to modify its args and return a pointer into it, - so this prevents an overlapping strlcpy. bz#3819, patch from cjwatson - at debian.org - - OpenBSD-Commit-ID: c32e496e6a1618aba31c8b7a9d4e1376c5ea6aa1 - -commit b5877b7b3e597f47578ade9dbe7e4332f112dfc4 -Author: dtucker@openbsd.org -Date: Thu May 22 03:41:10 2025 +0000 - - upstream: Add $OpenBSD$ marker for easier syncing. - - OpenBSD-Commit-ID: 27ff3e1e2e6610d9981ebe43ae9b783236800035 - -commit 58d094c7cb974d7bd3ba6eb1059b186a2ac3dd55 -Author: djm@openbsd.org -Date: Wed May 21 12:12:20 2025 +0000 - - upstream: Correct FILES section to mention new default path to - - agent sockets. Spotted by / ok jmc@ - - OpenBSD-Commit-ID: 91d736d78d71a4276c9cbb075b1462bbc3df55a6 - -commit d1d5c8b9b8de8283618c18d0dafdec6a209911cc -Author: Darren Tucker -Date: Thu May 22 12:25:35 2025 +1000 - - Fix nc install some more. - -commit 49a2412ad23162e44be9e0b2cb12f6daf6b666d7 -Author: Darren Tucker -Date: Thu May 22 12:21:11 2025 +1000 - - Fix cvs up of nc. - -commit df22801b3f0ae245f825cf9c9dbb4543e41a7c5c -Author: Darren Tucker -Date: Thu May 22 11:34:04 2025 +1000 - - Install nc during upstream test. - - This ensures that the installed nc matches the expectations of the - regress tests. - -commit e391c5289c2b687ff886cf780dc8fcb426e4d5d2 -Author: Darren Tucker -Date: Thu May 22 10:52:31 2025 +1000 - - Remove 9.7 branch from CI status page. - - It's been obsolete long enough that github no longer reports its - status. - -commit d62a21d9831b49007d172a455a98fd81862fcf51 -Author: Chris Rapier -Date: Wed May 21 16:52:20 2025 -0400 - - Add RFC 8305 compliance to HPN-SSH. - - This is a patched based on one written by - Kim Minh Kaplan and submitted to OpenSSH in 2018. - This implements *some* features of RFC 8305 but, - significnatly, does not do asynchronous DNS queries. - It is currently only implemented for direct and proxy - connections as found in sshconnect.c. This is the first - version of the patch and is not in its final form. Eventually - the RFC 8305 methods will be moved their own file and the - necessary methods made public for use elsewhere in the - code base. - - Note: the regression test is of dubious value as the - tests happen on localhost. It's mostly to ensure that - any connection can take place rather than testing the - functionality of the imeplementation. This will likely - change in future versions. - -commit 88052b1865d612bfd2fd6438961fe6aec38b608e -Author: Chris Rapier -Date: Wed May 21 16:52:20 2025 -0400 - - Add RFC 8305 compliance to HPN-SSH. - - This is a patched based on one written by - Kim Minh Kaplan and submitted to OpenSSH in 2018. - This implements *some* features of RFC 8305 but, - significnatly, does not do asynchronous DNS queries. - It is currently only implemented for direct and proxy - connections as found in sshconnect.c. This is the first - version of the patch and is not in its final form. Eventually - the RFC 8305 methods will be moved their own file and the - necessary methods made public for use elsewhere in the - code base. - -commit b71773c20d566fa5dcaf9edf3139bdcb3f2c4bc2 -Author: Damien Miller -Date: Wed May 21 19:14:47 2025 +1000 - - pull a small netcat SOCKS4A fix from upstream - -commit 0adb2db25eff3fe1c90c55654387ae1e4e18a396 -Author: djm@openbsd.org -Date: Wed May 21 08:41:52 2025 +0000 - - upstream: test SOCKS4A; ok tb - - OpenBSD-Regress-ID: d880b75280295cd581a86e39bb0996d347f122d2 - -commit 5699f4e9553c6a228fd9dc578d99e3aa6451c014 -Author: djm@openbsd.org -Date: Wed May 21 08:36:39 2025 +0000 - - upstream: remove log tarballing "it seemed like a good idea at the - - time" - dtucker@ - - ensure that log files have correct perms when running under sudo/doas - - ok dtucker@ - - OpenBSD-Regress-ID: 20588c14b05de9519f85d638b374b66ae0678c89 - -commit 0c14e6b69a20f20d602e0e72559ca3f4dbc797fb -Author: djm@openbsd.org -Date: Wed May 21 06:44:24 2025 +0000 - - upstream: use logit_f("...") instead of logit("func: ...") - - OpenBSD-Commit-ID: c8d49eb39a9abff3cbcaeaf7df9d48468a5a0695 - -commit 1743589d038476f28dc4dfb1f69317649ae22ac5 -Author: djm@openbsd.org -Date: Wed May 21 06:43:48 2025 +0000 - - upstream: function to make a sshbuf from a hex string; useful in - - tests - - also constify some arguments - - OpenBSD-Commit-ID: 00f9c25b256be0efd73f2d8268ff041bc45ffb2c - -commit 83729cf503289104d7e64a69be14579523988cb6 -Author: Damien Miller -Date: Wed May 21 18:47:46 2025 +1000 - - merge netcat SOCKS4A support from OpenBSD - - Not a full sync of this file as we have diverged substantially - from upstream (it has libtls support, etc.) - -commit 750f1867476bda36879f69e25e8f52cb45c58807 -Author: Darren Tucker -Date: Tue May 20 22:17:02 2025 +1000 - - Include OpenSSL compat shim where needed. - -commit 6fb728df50c1afd338cb0223a84ce24579577eff -Author: Darren Tucker -Date: Tue May 20 19:28:55 2025 +1000 - - Run all tests on Cygwin again. - - ... now that we've fixed ci-setup on Cygwin. - -commit 648a3a008cf1cfa54631d2f0457b5313c455f484 -Author: Darren Tucker -Date: Tue May 20 18:48:23 2025 +1000 - - Use USERNAME rather than LOGNAME on Cygwin. - - LOGNAME is specified by POSIX, but Windows (or at least, github's - Windows images) don't set it. - -commit 0214e53124c09528b6ee29b9a551442b5611a454 -Author: Darren Tucker -Date: Tue May 20 18:28:52 2025 +1000 - - Add debug output when setting up CI environment. - -commit 9d9a2c0369419f3b4952e597db7b8696f54e7f3a -Author: Darren Tucker -Date: Tue May 20 19:16:38 2025 +1000 - - Include openssl compat shims in test. - - Fixes tests on platforms using older LibreSSL releases prior to 3.4. - -commit 1a9b1cfa4e8b807c7f82fdba8f730c2abdbba071 -Author: Darren Tucker -Date: Tue May 20 18:14:06 2025 +1000 - - Add compat shims for EC_POINT affine_coordinates - - LibreSSL <3.4 does not have EC_POINT_[gs]et_affine_coordinates - but does have the now-deprecated _GFp variantes. We still support - LibreSSL back as far as 3.2.x so add a compat shim. - -commit cff2175200b412a9207a4fe5c1bdcc54e8a73d07 -Author: tb@openbsd.org -Date: Mon May 12 05:42:02 2025 +0000 - - upstream: Use EC_POINT_[sg]et_affine_coordinates() - - It is available in all supported OpenSSL flavors/versions and the _GFp - variants will be removed from LibreSSL. - - ok hshoexer jsing - - OpenBSD-Regress-ID: 66cf1561e7b6c49002978f2d6720956f33a882f0 - -commit 2d35e24739b515394017b74465a0996c384cf28f -Author: tb@openbsd.org -Date: Mon May 12 05:41:20 2025 +0000 - - upstream: Use EC_POINT_[sg]et_affine_coordinates() - - It is available in all supported OpenSSL flavors/versions and the _GFp - variants will be removed from LibreSSL. - - ok hshoexer jsing - - OpenBSD-Commit-ID: ecedca0e1ffa80e0c9ef7c787bc6a972882c596b - -commit 17003b9f1cd7b7bf1f52493cc4a1ab95727c3ed7 -Author: djm@openbsd.org -Date: Fri May 9 02:42:03 2025 +0000 - - upstream: make the progress-meter code safe against being called - - when not initialised; spotted by tb@ feedback/ok tb@ deraadt@ - - OpenBSD-Commit-ID: a9fda1ee08a24c62e0981ff6d15ca93b63467038 - -commit 2d023e7a95d673e93ccc1978bf8931f7335b2b53 -Author: tedu@openbsd.org -Date: Thu May 8 17:32:53 2025 +0000 - - upstream: convert a last quad_t to int64_t. ok deraadt djm - - OpenBSD-Commit-ID: 1c9e01ba1a9ccf442a9cdf10f222077f66885f1f - -commit fc8c56ade809f66f7df4b5153a4d92593631c12a -Author: Darren Tucker -Date: Tue May 20 15:01:29 2025 +1000 - - Set runner pasword to random string. - - The most recent version of the Github ubuntu-latest image sets the - password field to "!" which sshd considers to be a locked account, - breaking most of the tests. - -commit c404686c17daeda7e95ca6fc14c8a4a570cf975d -Author: Darren Tucker -Date: Sun May 11 22:54:13 2025 +1000 - - Debug log for why an account is considered locked. - -commit ee1d31781cf0d292a50b4df4cb8cb6ffcbfbe9af -Author: Darren Tucker -Date: Sun May 11 16:35:31 2025 +1000 - - Move debug log output into separate workflow step. - - Should reduce the need to scroll back to find out which test actually - failed. - -commit ddfb78a15f57a33427d462b9c401de5c8e6799da -Author: Darren Tucker -Date: Sat May 10 21:48:06 2025 +1000 - - Skip sftp-perm on Cygwin too. - -commit 8846caccb86b3f5a4f1c10bfffcc9cf1adc17925 -Author: Darren Tucker -Date: Sat May 10 10:23:30 2025 +1000 - - Remove CYGWIN binmode as it's now obsolete. - -commit cf795d55437e6c1ffe85e90e0fae00e885e50036 -Author: Darren Tucker -Date: Sat May 10 09:25:18 2025 +1000 - - Also skip sftp-cmds test on Cygwin. - - Fails at the hardlink step. - -commit d1b28639c1cb382943bd92c68992ea74af9b5773 -Author: Darren Tucker -Date: Sat May 10 08:52:11 2025 +1000 - - Tell Cygwin to use native symlinks. - -commit 56782dad7d7f96b4943951227515bd7904ac3cf7 -Author: Darren Tucker -Date: Sat May 10 08:26:37 2025 +1000 - - Skip keygen-knownhost test on Cygwin. - - It fails but at this time it's not clear why. - -commit d5cbac2364b03e55b733a2422a07e78e16d2a118 -Author: Darren Tucker -Date: Sat May 10 07:59:44 2025 +1000 - - Pass Cygwin setup location to CI setup. - - (instead of hard coding it, wrongly). - -commit 82f1f52c5582f005761e4e200c279ddd9c6781e4 -Author: Darren Tucker -Date: Sat May 10 06:37:24 2025 +1000 - - Add RUN_ONLY_TEST to limit which tests are run. - - For testing, you can set the repo variable RUN_ONLY_TEST in your repo - (Repo -> Settings -> Security -> Actions -> Variables) to run only that test. - -commit 140ba45895de8ebfb3e2517b0ddee58729979c29 -Author: Darren Tucker -Date: Fri May 9 19:32:06 2025 +1000 - - Move misc-agent.o to LIBSSH_OBJS. - - It's needed by the fuzzer. - -commit 3357bf2fe2d11b6ed4465c1ed2871bd1099cbbc5 -Author: Darren Tucker -Date: Fri May 9 19:08:36 2025 +1000 - - Put PRIV_ECDSA back, it's still used. - - Should fix oss-fuzz test. - -commit f5726215957bb34e18bb872d527845c2f64e2389 -Author: Darren Tucker -Date: Thu May 8 18:56:39 2025 +1000 - - Since it's unused, make dirfd() take void *. - - Some platforms (eg Old BSDs) in some configurations define DIR to "void - *", which causes compile errors in the no-op implementation. - -commit 1511f113a27d8aafe080aa6493cb3c0cf2b5abe0 -Author: Darren Tucker -Date: Thu May 8 11:38:24 2025 +1000 - - Add no-op implmentation of dirfd(). - - Fixes build on pre-POSIX.1 2008 systems. - -commit 086369736a9496b39af0d9f09443fa81b59b7f05 -Author: Daniel Kahn Gillmor -Date: Wed Apr 16 10:18:34 2025 +1000 - - ssh-agent: exit 0 from SIGTERM under systemd socket-activation - - When the ssh-agent service is configured to be launched under systemd - socket-activation, the user can inspect the status of the agent with - something like: - - systemctl --user status ssh-agent.service - - If the user does: - - systemctl --user stop ssh-agent.service - - it causes the `systemd --user` supervisor to send a SIGTERM to the - agent, which terminates while leaving the systemd-managed socket in - place. That's good, and as expected. (If the user wants to close the - socket, they can do "systemctl --user stop ssh-agent.socket" instead) - - But because ssh-agent exits with code 2 in response to a SIGTERM, the - supervisor marks the service as "failed", even though the state of the - supervised service is exactly the same as during session startup (not - running, ready to launch when a client connects to the socket). - - This change makes ssh-agent exit cleanly (code 0) in response to a - SIGTERM when launched under socket activation. This aligns the systemd - supervisor's understanding of the state of supervised ssh-agent with - reality. - - Signed-off-by: Daniel Kahn Gillmor - -commit 755c3d082e59e6884f28d30e6333a1444e9173d1 -Author: Darren Tucker -Date: Wed May 7 21:05:06 2025 +1000 - - Skip d_type check on platforms that don't have it. - - On those, the subsequent stat() should catch the sockets. - -commit 207289a5663bdf49903e1aeb938dcc0924e2ac63 -Author: dtucker@openbsd.org -Date: Wed May 7 10:44:26 2025 +0000 - - upstream: Rename sockaddr_un sun -> sunaddr. - - This makes things easier in -portable, where on Solaris an derivatives - "sun" is defined to "1", causing compilation errors. ok deraadt@. - - OpenBSD-Commit-ID: 0669043afb49856b57b382f0489221bd98305d3b - -commit 7cc8e150d51a4545b86d996692b541419b35d1a3 -Author: djm@openbsd.org -Date: Tue May 6 06:05:48 2025 +0000 - - upstream: remove DSA from the regression/unit test suite too. - - OpenBSD-Regress-ID: 4424d2eaf0bce3887318ef6d18de6c06f3617d6e - -commit 0404fa799746c283325a463c363436eb152daefc -Author: djm@openbsd.org -Date: Tue Apr 15 05:31:24 2025 +0000 - - upstream: another missing ifdef - - OpenBSD-Regress-ID: 4f71f8f122eac4cbf7f1d2088a9be45317dd3e4a - -commit c5dbbe8805caaee132545ab4cffd3b2221e80975 -Author: djm@openbsd.org -Date: Tue Apr 15 05:00:13 2025 +0000 - - upstream: missing ifdef - - OpenBSD-Regress-ID: 7260fb672de5738c17dec06c71a5be0186bb2b09 - -commit 93e904a673a632604525fdc98b940b7996f1ce54 -Author: djm@openbsd.org -Date: Wed May 7 04:10:21 2025 +0000 - - upstream: memory leak on error path; bz3821 - - OpenBSD-Commit-ID: 65577596a15ad6dd9a1ab3fc24c1c31303ee6e2b - -commit 55b38ff4d7286c8fac2a472da664462e0f2d75e0 -Author: deraadt@openbsd.org -Date: Tue May 6 15:15:05 2025 +0000 - - upstream: test ssh-agent with the -T flag to force the old /tmp - - location rather than inside the homedir. During relink operation, - /.ssh/agent was created which is surprising. This test sequence could use - some improvement so this is a temporary fix. observed by florian, change ok - semarie - - OpenBSD-Commit-ID: c7246a6b519ac390ca550719f91acfdaef1fa0f0 - -commit a32d28d792567253bb601362f36391f155f8f772 -Author: djm@openbsd.org -Date: Tue May 6 05:40:56 2025 +0000 - - upstream: finally remove DSA signature support from OpenSSH. - - feedback/ok tb@, ok deraadt@ - - OpenBSD-Commit-ID: bfe6ee73c1b676c81a2901030c791f8ec888228f - -commit 928f8dcc1bb622c25be409c34374b655d0149373 -Author: djm@openbsd.org -Date: Mon May 5 05:51:11 2025 +0000 - - upstream: Now that there's an I-D for certificate keys, refer to - - that instead of the much more basic format description we had previously. - - OpenBSD-Commit-ID: cf01e0727a813fee8626ad7b3aa240621cc92014 - -commit fe883543bece18c975fa53aa02104f0433645d99 -Author: jmc@openbsd.org -Date: Mon May 5 05:47:28 2025 +0000 - - upstream: - add full stop to the text in -a - move the -U and -u - - text to the correct place - - OpenBSD-Commit-ID: 2fb484337a0978c703f61983bb14bc5cbaf898c2 - -commit 5fd6ef297dec23e3574646b6334087131230d0a6 -Author: Darren Tucker -Date: Tue May 6 19:01:00 2025 +1000 - - Add minimal implementations of fstatat and unlinkat. - - Fixes build on some pre-POSIX.1-2008 platforms. - -commit d2480827b3ef6ec119965822afdff35d734b2dee -Author: Darren Tucker -Date: Tue May 6 08:15:34 2025 +1000 - - New location of cygwin setup. - -commit 57eb87b15bd0343372f99d661ce95efb25a16f1e -Author: Darren Tucker -Date: Tue May 6 08:07:23 2025 +1000 - - Boringssl now puts libcrypto in a different place. - -commit 61525ba967ac1bb7394ea0792aa6030bcbbad049 -Author: Darren Tucker -Date: Mon May 5 20:45:42 2025 +1000 - - Handle systems that don't have st_mtim. - - Ignores nanoseconds, but it's checking for >1h old so a few nanoseconds - shouldn't matter much. Fixes build on Mac OS X. - -commit 27861e9b15151898841097c14ee974c026093131 -Author: Darren Tucker -Date: Mon May 5 19:09:25 2025 +1000 - - Supply timespecsub if needed. - -commit 7c0e6626e4be53efcfbb92f0c6382a76f1138e38 -Author: Darren Tucker -Date: Mon May 5 19:08:48 2025 +1000 - - includes.h for compat, time.h for clock_gettime. - -commit 7a7cc3cf721fe7fe9f4925d92bb7c694b8550a7f -Author: Darren Tucker -Date: Mon May 5 18:51:34 2025 +1000 - - Cygwin install in back on D: - -commit 6ab8133c067a8e91ba69ce7ca04f95b50f2f2d7b -Author: Damien Miller -Date: Mon May 5 14:59:30 2025 +1000 - - depend - -commit 12912429cf39cfeca97dd18a8f875ad9824d1751 -Author: djm@openbsd.org -Date: Mon May 5 03:35:06 2025 +0000 - - upstream: missing file in previous commit - - OpenBSD-Commit-ID: e526c97fcb2fd9f0b7b229720972426ab437d7eb - -commit 80162f9d7e7eadca4ffd0bd1c015d38cb1821ab6 -Author: djm@openbsd.org -Date: Mon May 5 02:48:06 2025 +0000 - - upstream: Move agent listener sockets from /tmp to under - - ~/.ssh/agent for both ssh-agent(1) and forwarded sockets in sshd(8). - - This ensures processes (such as Firefox) that have restricted - filesystem access that includes /tmp (via unveil(3)) do not have the - ability to use keys in an agent. - - Moving the default directory has the consequence that the OS will no - longer clean up stale agent sockets, so ssh-agent now gains this - ability. - - To support $HOME on NFS, the socket path includes a truncated hash of - the hostname. ssh-agent will by default only clean up sockets from - the same hostname. - - ssh-agent gains some new flags: -U suppresses the automatic cleanup - of stale sockets when it starts. -u forces a cleanup without - keeping a running agent, -uu forces a cleanup that ignores the - hostname. -T makes ssh-agent put the socket back in /tmp. - - feedback deraadt@ naddy@, doitdoitdoit deraadt@ - - OpenBSD-Commit-ID: 8383dabd98092fe5498d5f7f15c7d314b03a93e1 - -commit 566443b5f5d7bc4c5310313b4e46232760850c7a -Author: djm@openbsd.org -Date: Mon May 5 02:40:30 2025 +0000 - - upstream: correct log messages; the reap function is used for more - - than just the preauth process now - - OpenBSD-Commit-ID: 768c5b674bd77802bb197c31dba78559f1174c02 - -commit e048230106fb3f5e7cc07abc311c6feb5f52fd05 -Author: djm@openbsd.org -Date: Wed Apr 30 05:26:15 2025 +0000 - - upstream: make writing known_hosts lines more atomic, by writing - - the entire line in one operation and using unbuffered stdio. - - Usually writes to this file are serialised on the "Are you sure you - want to continue connecting?" prompt, but if host key checking is - disabled and connections were being made with high concurrency - then interleaved writes might have been possible. - - feedback/ok deraadt@ millert@ - - OpenBSD-Commit-ID: d11222b49dabe5cfe0937b49cb439ba3d4847b08 - -commit c991273c18afc490313a9f282383eaf59d9c13b9 -Author: djm@openbsd.org -Date: Wed Apr 30 05:23:15 2025 +0000 - - upstream: fix a out-of-bounds read if the known_hosts file is - - truncated after the hostname. - - Reported by the OpenAI Security Research Team - - ok deraadt@ - - OpenBSD-Commit-ID: c0b516d7c80c4779a403826f73bcd8adbbc54ebd - -commit b5b405fee7f3e79d44e2d2971a4b6b4cc53f112e -Author: Darren Tucker -Date: Sun Apr 20 09:07:57 2025 +1000 - - Set Windows permssions on regress dir. - - Prevents "unprotected private key file" error when running tests. - -commit 76631fdd04824c3e50ea6551d3611b1fe0216a41 -Author: Darren Tucker -Date: Fri Apr 18 08:18:52 2025 +1000 - - Add 10.0 branch to test status page. - -commit c627b468d3b99e487e2b24c90958ae57e633d681 -Author: Darren Tucker -Date: Fri Apr 18 08:14:16 2025 +1000 - - cygwin-install-action now puts setup.exe on D: - -commit 52bddbc1a7f53a1e5c871767913648eb639ac6d5 -Author: Darren Tucker -Date: Fri Apr 18 08:10:32 2025 +1000 - - Include time.h for clock_gettime(). - -commit 9b50cb171b5c56184ce6fa3994ce62f9882d2daf -Author: Darren Tucker -Date: Thu Apr 17 16:51:14 2025 +1000 - - Add includes.h for new tests. - - Fixes builds on older platforms. - -commit 46e52fdae08b89264a0b23f94391c2bf637def34 -Author: Darren Tucker -Date: Wed Apr 16 22:29:17 2025 +1000 - - Provide INFINITY if it's not provided. - - INFINITY is specified in c99, so define if not provided. - -commit 849c2fd894aa87a7e40c71e8d5bda5392b1205be -Author: Darren Tucker -Date: Tue Apr 15 21:58:49 2025 +1000 - - Look for sqrt(), possibly in libm. - - The unit tests now use sqrt(), which in some platforms (notably - DragonFlyBSD and Solaris) is not in libc but rather libm. Since only - the unit tests use this, add TESTLIBS and if necessary put libm in it. - -commit 1ec5b39f1f673beac039bb42c98a11aa2b08a0b2 -Author: dtucker@openbsd.org -Date: Tue Apr 15 09:22:25 2025 +0000 - - upstream: Cast signalled_keydrop to int when logging to prevent warning - - on platforms where sig_atomic_t is not the same as int. bz#3811, patch from - jlduran at gmail com. - - OpenBSD-Commit-ID: b6bc9e9006e7f81ade57d41a48623a4323deca6c - -commit f3d465530e75cb6c02e2cde1d15e6c4bb51ebfd9 -Author: djm@openbsd.org -Date: Tue Apr 15 04:00:42 2025 +0000 - - upstream: basic benchmarking support for the unit test framework enable - - with "make UNITTEST_BENCHMARK=yes" - - ok dtucker@ - - OpenBSD-Regress-ID: 7f16a2e247f860897ca46ff87bccbe6002a32564 - -commit 609fe2cae2459d721ac11d23cd27b8a94397ef3c -Author: jmc@openbsd.org -Date: Mon Apr 14 05:41:42 2025 +0000 - - upstream: rework the text for -3 to make it clearer what default - - behaviour is, and adjust the text for -R to make them more consistent; - - issue raised by mikhail mp39590; - behaviour explained by naddy - - ok djm - - OpenBSD-Commit-ID: 15ff3bd1518d86c84fa8e91d7aa72cfdb41dccc8 - -commit 7351c8c41bf504c1da33d4fa9778c8a8ba6435c8 -Author: Chris Rapier -Date: Thu Apr 10 17:02:58 2025 -0400 - - Neglected to add documentation for MPTCP to the HPN-README - -commit 02827a8051bae7abc353960be4eb483a7f63bbf7 -Merge: 5334968dd 1dfc85f68 -Author: Chris Rapier -Date: Thu Apr 10 16:53:32 2025 -0400 - - Merge pull request #121 from rapier1/dev_minor - - Merge OpenSSH 10.0 into HPNSSH 18.7.0 - -commit 1dfc85f68939c9c6a8d9b12cbf902dda14a0d352 -Author: Chris Rapier -Date: Thu Apr 10 14:52:33 2025 -0400 - - Move the process to insert the none cipher into the kex proposals - into sshd_auth.c - - This process was originally in sshd.c but the correct values for - options.ciphers were not being properly picked up in do_ssh2_kex. - By moving this into the do_ssh2_kex function in sshd-auth.c none is - properly added to the list of available ciphers. - -commit 01a0d63b6c251d3b457a8e87a5c10417aebde841 -Author: Chris Rapier -Date: Wed Apr 9 11:58:45 2025 -0400 - - Clean up of autogenerated files. - -commit ede97420e4a25d9acbd2d54a825ba735c9486a44 -Merge: 95d31b0ea 2593769fb -Author: Chris Rapier -Date: Wed Apr 9 11:51:32 2025 -0400 - - Merge OpenSSH 10.0p1 release into HPN-SSH 18.7.0 - -commit 2593769fb291fe6c542173927698c69e9f9a08b9 -Author: Damien Miller -Date: Wed Apr 9 17:02:43 2025 +1000 - - autogenerated files for release - -commit 8725dbc5b5fcc3e326fc71189ef8dba4333362cc -Author: Damien Miller -Date: Wed Apr 9 17:02:17 2025 +1000 - - update version numbers - -commit cc7feb9458ad3b893b53dc9c7500d1affd208bde -Author: djm@openbsd.org -Date: Wed Apr 9 07:00:21 2025 +0000 - - upstream: openssh-10.0 - - OpenBSD-Commit-ID: db5b4a1f1c9e988f8f166b56dc5643606294b403 - -commit fc86875e6acb36401dfc1dfb6b628a9d1460f367 -Author: djm@openbsd.org -Date: Wed Apr 9 07:00:03 2025 +0000 - - upstream: Fix logic error in DisableForwarding option. This option - - was documented as disabling X11 and agent forwarding but it failed to do so. - Spotted by Tim Rice. - - OpenBSD-Commit-ID: fffc89195968f7eedd2fc57f0b1f1ef3193f5ed1 - -commit dd73459e351b0a2908aed90910c8ff9b0b381c6d -Author: djm@openbsd.org -Date: Wed Apr 9 01:24:40 2025 +0000 - - upstream: oops, I accidentally backed out the typo fix - - OpenBSD-Commit-ID: f485f79bf3e9ebbe1de13ac96150cf458956cfd8 - -commit 0cb945891944bada5850e85d60afa3c807cf1af6 -Author: djm@openbsd.org -Date: Wed Apr 9 01:23:47 2025 +0000 - - upstream: typo - - OpenBSD-Commit-ID: f912725c7d303720706b3ccfb2cb846d46296d13 - -commit cd4a6bd50b658d707867caa1f5aa40b35c2b6c19 -Author: Damien Miller -Date: Wed Apr 9 09:49:55 2025 +1000 - - initialise websafe_allowlist in agent fuzzer - -commit 55b7cb48af96c1102ef8ab5a73bb329cbed30945 -Author: djm@openbsd.org -Date: Tue Apr 8 23:10:46 2025 +0000 - - upstream: typo - - OpenBSD-Regress-ID: 08477b936d1d0c1e8a98aa1c0e1bdde8871894c9 - -commit 985d8cbcd3438cc36b4e709476f1783e358ddfb1 -Author: djm@openbsd.org -Date: Tue Apr 8 23:10:08 2025 +0000 - - upstream: typo - - OpenBSD-Commit-ID: 6e683e13e72bf1e43bbd3bbc6a8332d5a98bdc99 - -commit 95d31b0ea784918a606664b8e4b05e7c54fe0594 -Author: Chris Rapier -Date: Tue Apr 8 15:33:16 2025 -0400 - - Remove boringssl and aws-lc tests from CI tests. - - boringssl and aws-lc are not supported by HPN-SSH. - -commit 71256fb4523018a6dc44371ecde3eaf9da69ee5d -Merge: 986eb94c2 000c3d14e -Author: Chris Rapier -Date: Mon Apr 7 14:50:41 2025 -0400 - - Merge branch 'openssh_master' into feature_mptcp_test - -commit 986eb94c2cff4ba113d5dd1777e9cfc5d48a2885 -Merge: 4fce456c7 f878b723f -Author: Chris Rapier -Date: Mon Apr 7 14:49:51 2025 -0400 - - Merge branch 'feature_mptcp_test' of github.com:/rapier1/hpn-ssh into feature_mptcp_test - -commit 000c3d14e94d8f7597087c457260ea9417045b65 -Author: dtucker@openbsd.org -Date: Mon Apr 7 08:12:22 2025 +0000 - - upstream: Include time.h for time(). - - Fixes warning on some platforms when building without openssl. - - OpenBSD-Commit-ID: 04ca29b8eaae1860c7adde3e770baa1866e30a54 - -commit 49b8b9bf829e08af22366530614a5e59ac341ca9 -Author: tb@openbsd.org -Date: Wed Apr 2 04:28:03 2025 +0000 - - upstream: Wrap #include in #ifdef WITH_DSA - - ok djm - - OpenBSD-Commit-ID: ed01a7c102243f84e4a317aefb431916d98aab15 - -commit f878b723fa343fb1d25829d58b2a108b97858926 -Author: Chris Rapier -Date: Fri Apr 4 13:21:21 2025 -0400 - - Enhance visibility of warning for regression tests. - - The warned test is now printed in red with - preceeding and trailing newlines. This is to make it - more visible - -commit 5d67b7d542e536393e9e49ebf7cec61e52df568c -Author: Chris Rapier -Date: Fri Apr 4 13:15:49 2025 -0400 - - Merged the HPN-SSH 18.7 port for the runup to the - OpenSSH 10.0 release. Added regression test. - - This version of the MPTCP code gets rid of the configure test and - relies on the socket not being created if they request mptcp - and it doesn't exist on their system. - - Additionally, created a regression test for mptcp based on - the simple connect test. If this test fails it will *not* - exit the tests as a whole but will issue a warning instead. - This isn't properly communicated to the master make file but - it's what we have. If a warning is thrown we do keep a copy of the - logs. - -commit 2c6dbec77513404ad3a70438affffdd29fc95fa9 -Merge: 64a5038df 1c2e61203 -Author: Chris Rapier -Date: Fri Apr 4 11:43:19 2025 -0400 - - First pass at merging MPTCP into 18.7.0 - -commit 4fce456c7c5cb2806c9e852abdf546e3a7d37aff -Merge: 64a5038df 1c2e61203 -Author: Chris Rapier -Date: Thu Apr 3 17:40:34 2025 -0400 - - Missed some debug statements in sshd-auth.c - -commit 1c2e612033d60559ec286d9e72b9d94e9b5a80be -Merge: 5334968dd f80fb819e -Author: Chris Rapier -Date: Thu Apr 3 15:09:18 2025 -0400 - - First pass at incorporating OpenSSH 10.0. - - This does not include the MPTCP work - -commit f80fb819e5521e13f167edbcc3eed66e22ad0c2a -Author: Damien Miller -Date: Thu Apr 3 09:10:19 2025 +1100 - - remove all instances of -pie from LDFLAGS - - Previously only the first instance of this flag was removed. - Unbreaks build on OpenSUSE Tumbleweed. Patch from Antonio Larrosa - -commit 6c9872faa1c297a84c6d3e3b95a927be99eadbf6 -Author: djm@openbsd.org -Date: Tue Apr 1 23:23:20 2025 +0000 - - upstream: remove ability to enable DSA support. Actual code will be - - g/c'd separately. ok deraadt@ - - OpenBSD-Commit-ID: 2a032b75156c4d922e8343fa97ff6bc227f09819 - -commit 64a5038dfb96149a94eef54a5c89a52bda889db2 -Author: Chris Rapier -Date: Mon Mar 31 17:04:23 2025 -0400 - - Get MPTCP availablity in configure. - Fail if MPTCP is requested and not available. - -commit 8460aaa4e1f8680f03cc5334556b9440b401f010 -Author: dtucker@openbsd.org -Date: Fri Mar 28 21:45:55 2025 +0000 - - upstream: Add TEST_SSH_SSHD_ENV to sshd lines here too. - - OpenBSD-Regress-ID: 045f2c88b42d694b404db51c5de5eca20d748ff1 - -commit 5fa5271ed8db79da18ca324b524b9983caf158b8 -Author: Chris Rapier -Date: Fri Mar 28 14:52:45 2025 -0400 - - I missed some duplicate lines in a merge/ - -commit d296fc3fbb45eebdce11d9f6bd378108de76d9e4 -Merge: b0135edd5 5334968dd -Author: Chris Rapier -Date: Fri Mar 28 14:12:29 2025 -0400 - - Update MPTCP branch to current master (18.6.2) - -commit 5e60f5937b9c33190b9d7614f72d85d4a9b38d3d -Author: dtucker@openbsd.org -Date: Fri Mar 28 06:04:07 2025 +0000 - - upstream: Pass "ControlMaster no" to ssh when invoked by scp & sftp. - - If you have ControlMaster auto (or yes) in your config, and the - first connection you make is via scp or sftp, then you may get a - few unexpected options applied to it (eg ForwardX11 no), since sftp - and sftp explicitly disable those for reasons. These effects will - persist beyond the initial scp or sftp command. - - This explicitly disables persistent session *creation* by scp and sftp. - It will not prevent them from using an existing session if one has - already been created. - - From Github PR#557, ok djm@ kn@ - - OpenBSD-Commit-ID: 9dad7c737466837e0150c4318920f46d844770c4 - -commit bbd36869dfb4b770cc9e6a345c04a585a0955aec -Author: dtucker@openbsd.org -Date: Fri Mar 28 05:41:15 2025 +0000 - - upstream: Set sshd environment variables during sshd test run too. - - OpenBSD-Regress-ID: 50cb325d92c390a2909662c901f6ac5d80b6f74d - -commit 98f05b1484daddef2f56b79e24540523b5016143 -Author: dtucker@openbsd.org -Date: Fri Mar 28 05:36:24 2025 +0000 - - upstream: Add TEST_SSH_SSHD_ENV variable which is added to sshd's - - environment. Will be used in Portable to tweak behaviour of tcmalloc's - debugging. - - OpenBSD-Regress-ID: 67e38c3c4517ddb72c8a3549a3325a166d7bb6d6 - -commit 8cd9ed4df0eccc825eca0c45354a37332e125e38 -Author: dtucker@openbsd.org -Date: Fri Mar 28 05:33:30 2025 +0000 - - upstream: chown log directory in addition to log files. - - OpenBSD-Regress-ID: b520d54a0bbf2c6554413c798218bda26b385ad9 - -commit e32de6bf4f3229d4838beb127de45eed1377ccc5 -Author: Darren Tucker -Date: Fri Mar 28 16:47:58 2025 +1100 - - Be explicit about environment variables for tests. - - This will make it easier to reproduce a test failure by cut-and-paste of - the corresponding line from the github log. - -commit 77a3e6ba47381547b3fe4b29223256f276fbd07e -Author: Darren Tucker -Date: Fri Mar 28 16:46:40 2025 +1100 - - Add tcmalloc flags to TEST_SSH_SSHD_ENV. - - This will get passed to sshd via test-exec.sh. - -commit a73890e340fbd6121251854b658a72d738b86c84 -Author: Darren Tucker -Date: Thu Mar 27 23:04:44 2025 +1100 - - Add PuTTY 0.81, 0.82 and 0.83 to tests. - -commit 90a28de0d49570324d1695c0b4686354ef3bcae0 -Author: Darren Tucker -Date: Thu Mar 27 22:30:40 2025 +1100 - - Include TCMALLOC_STACKTRACE_METHOD in output. - - If TCMALLOC_STACKTRACE_METHOD happens to be set, include it in the debug - output to make reproducing test cases easier. - -commit fd5a6bb6dd7657c4bd8cd0ee11d5c8ddf0d927b2 -Author: Darren Tucker -Date: Thu Mar 27 20:15:11 2025 +1100 - - Test with-linux-memlock-onfault in kitchensink. - -commit 22330711e2459c23d9736ee16e0e2ee0fcc30b9a -Author: Collin Funk -Date: Wed Mar 26 18:24:59 2025 -0700 - - Include fcntl.h so AT_FDCWD does not get redefined. - -commit 6c49e5f7dcaf886b4a702a6c003cae9dca04d3ea -Author: Daniil Tatianin -Date: Thu Feb 27 11:37:13 2025 +0300 - - Add support for locking memory on Linux - - Linux wakes up kcompactd threads in order to make more contiguous memory - available on the system, it does this by migrating live movable pages - (actively modifying live processes' page tables and constantly flooding - them with page invalidation IPIs, which can be up to millions per - second), which causes the process to become unresponsive for up to - seconds or even minutes in some severe cases. In case of sshd, we want - to always be able to connect to the system, even if it's under heavy - kcompactd load. - - Introduce an option to protect sshd and its children sessions from being - compacted by kcompactd (this works in cojunction with - compact_unevictable_allowed = 0). Note that we depend on MCL_ONFAULT - being available, which was introduced in linux 4.4. MCL_ONFAULT allows - the system to lock pages lazily, thus drastically reducing memory usage - of a locked process (without MCL_ONFAULT, every existing mapping in the - process is instantly write-faulted). - -commit fdc4853c5b1567934d43ab13282f03033cc21325 -Author: Daniil Tatianin -Date: Thu Feb 27 11:46:25 2025 +0300 - - platform: introduce a way to hook new session start - - Previously this was possible via post_fork_child, but ever since sshd - was split into multiple binaries, this is now no longer possible becase - of execv. - -commit 5334968dd69fab9f72420c0e09d75f417310ffb0 -Author: Chris Rapier -Date: Wed Mar 19 10:00:02 2025 -0400 - - Neglected to increment version number - -commit 1b311b6b17be81577514c38e8be4f5740d7df496 -Author: dtucker@openbsd.org -Date: Wed Mar 19 06:11:15 2025 +0000 - - upstream: Prevent theoretical NULL deref in throughlocal_sftp. - - Coverity CID 405019, although at the moment it's not reachable. ok djm@ - - OpenBSD-Commit-ID: 630d46c1021b69fbb470e349976c70e9a48b7644 - -commit 96493ebd6ff48bbb802576e208794a26928569b0 -Author: Darren Tucker -Date: Wed Mar 19 17:35:10 2025 +1100 - - Fix workflow syntax again. - -commit 575c43fd4c44d376b1771c0fdaf4941021ba88c9 -Author: Darren Tucker -Date: Tue Mar 18 20:54:48 2025 +1100 - - Differentiate logfiles better. - -commit 8a1294638f3a47d46263ea574fa85c8e115ea893 -Author: Darren Tucker -Date: Tue Mar 18 20:27:46 2025 +1100 - - Fix another typo in workflow. - -commit bd9e6bbcc864b3e10c4e11f5aec1b3a5e3a89b55 -Author: Darren Tucker -Date: Tue Mar 18 18:16:12 2025 +1100 - - Fix syntax error in workflow. - -commit ce88a1bb4a2e6425752094f7a2eb4adfb0ca7971 -Author: Darren Tucker -Date: Tue Mar 18 18:13:14 2025 +1100 - - Identify each logfile while printing them. - -commit b58e429960c4791fc4e30bb7c70d1f77d538b546 -Author: djm@openbsd.org -Date: Tue Mar 18 04:53:14 2025 +0000 - - upstream: fix NULL dereference for Match conditions missing - - arguments, e.g. "Match user". Spotted by Coverity (CID 477813) - - OpenBSD-Commit-ID: 13584281cfa23b8ebc41f9d128a6b9464ae960d4 - -commit 0ce5281f017c3ad7bdcc2bbd9745119a73e0cbb8 -Author: tb@openbsd.org -Date: Fri Mar 14 09:49:49 2025 +0000 - - upstream: Fix EVP_CIPHER_CTX_ctrl() return checks - - While this API tries to translate negative return values (i.e. -1) to 0 - in BoringSSL and LibreSSL, it is still possible for it to return negative - values in prinicple. We even incorrectly document that -1 can be returned - while Boring and OpenSSL plead the Fifth. - - In OpenSSL 3 there are now code paths that explicitly return -1 and they - started shifting their return checks to <= 0 - of course they do this in - inconsistent and sometimes incorrect manner. While these paths aren't - reachable from ssh right now, who can really tell what happens in the two - hundred lines of inscrutable bloated mess this has become. - - So error check with <= 0 to ensure that we don't accidentally translate an - error to success. - - ok markus schwarze - - OpenBSD-Commit-ID: a855c833cf4ecfce43bedc761f26ad924f70483c - -commit aeb3e35ce0cd89e09fbe78cb0d4e9ae39b43d2e0 -Author: Chris Rapier -Date: Mon Mar 17 11:55:13 2025 -0400 - - Fix typo in README.md - -commit 403dd8810f0a0df4bac967fd50bf3d61ded1d6ea -Author: Chris Rapier -Date: Mon Mar 17 11:54:12 2025 -0400 - - Fix typo in REDDME.md - -commit 2e81100763d5885e500f065b04c16ed87ce74318 -Author: Darren Tucker -Date: Mon Mar 17 21:35:55 2025 +1100 - - Fix debug log path. - -commit 672c88f6c75993c4f5ee2a5308693de588d431ff -Author: Chris Rapier -Date: Fri Mar 14 10:26:59 2025 -0400 - - Updated README.md to introduce HPN-SSH more effectively - -commit 442a44970179d70ebb62bba792699eaec978a1db -Author: Darren Tucker -Date: Fri Mar 14 16:24:06 2025 +1100 - - Also lazily unmount workspace in case of straggers. - -commit 20427f6735fe5ddab31911ce5315adc71acf47d8 -Author: Darren Tucker -Date: Fri Mar 14 16:17:39 2025 +1100 - - Make sure upstream tests run on correct hardware. - -commit 91a2f70a56827ae31649baf17227b0914ac5aa36 -Author: Darren Tucker -Date: Fri Mar 14 13:47:27 2025 +1100 - - Add OpenBSD upstream test on obsdsnap-arm64. - -commit c20f7413525602b0ea786d8974d03a81f7ca2a92 -Author: Damien Miller -Date: Thu Mar 13 10:45:53 2025 +1100 - - rebuild .depend - -commit d47ef958b89c6fa809302d654009d3dfabe11b75 -Author: djm@openbsd.org -Date: Wed Mar 12 22:43:44 2025 +0000 - - upstream: remove assumption that the sshd_config and any configs - - included from it can fit in a (possibly enlarged) socket buffer, by having - the sshd listener mainloop actively manage sending the configuration to the - sshd-session subprocess. - - work by markus@ w/ a little feedback from me; - ok me and committing on his behalf - - OpenBSD-Commit-ID: 8f54451483f64951853074adb76bc4f838eaf3ae - -commit 9c90b563943c16418d737433ac478974b8761ee5 -Author: dtucker@openbsd.org -Date: Tue Mar 11 11:46:44 2025 +0000 - - upstream: Prime caches for DNS names needed for tests. - - When running the SSHFP tests, particularly on an ephemeral VM, the first - query or two can fail for some reason, presumably because something isn't - fully initialized or something. To work around this, issue queries for the - names we'll need before we need them. - - OpenBSD-Regress-ID: 900841133540e7dead253407db5a874a6ed09eca - -commit 10124eefe875a3e4e1cfb84ebe6a613ed3213b78 -Author: dtucker@openbsd.org -Date: Tue Mar 11 09:06:50 2025 +0000 - - upstream: Some dd's don't understand "1m", so handle seperately. - - OpenBSD-Regress-ID: 1d983b27c96f28f69d3a288c19e8d8c58e1b2ee3 - -commit c21c8fc319376c2f5e0da166e9e89a97a245ae72 -Author: Darren Tucker -Date: Tue Mar 11 19:17:46 2025 +1100 - - Lazily unmount github workspace at end of workflow. - - Sometimes when a test times out the workspace is still busy when we try - to unmount it, which leaves the runner unusable until it's cleaned up - manually. We try to unmount this in the first step, but that usually - doesn't work since it fails during setup before it starts our workflow. - Move it to the end and make it a lazy unmount so it hopefully works - eventually. - -commit 4bcbac742968f5086cfd4c570a51de25ef77931f -Author: dtucker@openbsd.org -Date: Tue Mar 11 07:50:20 2025 +0000 - - upstream: Add regress test for sftp resume. - - OpenBSD-Regress-ID: 37f629b3014338fa23a85df1e1bb320ea12282e1 - -commit e2c4f070b43a4fd7d59a9350e2fe78df605830b5 -Author: dtucker@openbsd.org -Date: Tue Mar 11 07:46:02 2025 +0000 - - upstream: Use ssh binary instead of the (smaller) script when - - preparing test data files since it's faster. - - OpenBSD-Regress-ID: 4215e42682fdb73e131e10645d4a1a23a91d64f5 - -commit 62f02e95ba5cda4649c482d30f4370e2360eb94d -Author: dtucker@openbsd.org -Date: Tue Mar 11 07:43:45 2025 +0000 - - upstream: Set up dbclient's known_hosts as it expects. - - OpenBSD-Regress-ID: 9e0898e8423237ce5023be53787bb4062e0d0418 - -commit 395284bd52887dbaf7e78200c857d7f2d9ce398e -Author: dtucker@openbsd.org -Date: Tue Mar 11 07:43:03 2025 +0000 - - upstream: Use $DBCLIENT to access dbclient for consistency. - - OpenBSD-Regress-ID: 81e1b41e1ffc49aba1e6fcaeb6242f3b7875ea3c - -commit 97e10c0005a784622c61cb4e8bb7858b410bbcc6 -Author: dtucker@openbsd.org -Date: Tue Mar 11 07:42:08 2025 +0000 - - upstream: Check if dbclient supports SHA1 before trying SHA1-based - - KEX. - - Dropbear 2025.87 removed SHA1 support by default, which means - diffie-hellman-group14-sha1 is not available. Unfortunately there isn't a - flag to query supported KEX, so instead check MACs and if it doesn't have - SHA1 methods, assuming SHA1 based KEXes are likewise not available. Spotted - by anton@. - - OpenBSD-Regress-ID: acfa8e26c001cb18b9fb81a27271c3b51288d304 - -commit 29a5127f808d00aa539fd27d83a65c2c56179b0e -Author: dtucker@openbsd.org -Date: Tue Mar 11 07:48:51 2025 +0000 - - upstream: Set highwater when resuming a "put". Prevents bogus "server - - reordered acks" debug message. ok djm@ - - OpenBSD-Commit-ID: aa7f6d0fc2e893c8c278ea3e6e0974c2eca83f5d - -commit 6575859d7acb110acf408707f98ed9744ca7d692 -Author: dtucker@openbsd.org -Date: Mon Mar 3 06:54:37 2025 +0000 - - upstream: Test for %-token and env var expansion in SetEnv. - - OpenBSD-Regress-ID: bd6139a6177ac4afb29a0ce4afc23567b22ef9f9 - -commit fd7ad8d7bf7dbdeb8f11a8b51aa9d31df1a17e52 -Author: dtucker@openbsd.org -Date: Sun Mar 2 07:41:06 2025 +0000 - - upstream: Also test User expansions when supplied via -l option and - - user@host. - - OpenBSD-Regress-ID: 56415859260b53ef0dd20f71225ba5fdf6320f50 - -commit e6cfd783f1491b502db9322aa970822c63f1667d -Author: dtucker@openbsd.org -Date: Sat Mar 1 06:12:47 2025 +0000 - - upstream: Tests for User expansion of %-tokens and environment - - variables. - - OpenBSD-Regress-ID: 7ed21dd0e09fb1f3537b8b177f171018aa501628 - -commit 197e503b8e4b642ce0f405a5d65da4256fa96431 -Author: djm@openbsd.org -Date: Fri Dec 6 16:25:58 2024 +0000 - - upstream: use glob(3) wildcards in AuthorizedKeys/PrincipalsFile - - tests to exercise this feature; ok dtucker - - OpenBSD-Regress-ID: 7f7b19c0b05b1862cc6521ce61b2b301a3f9cc3b - -commit 396202180180a4ac16788d469508a348789dafa1 -Author: djm@openbsd.org -Date: Fri Dec 6 10:37:42 2024 +0000 - - upstream: implement attestation verification for ED25519 keys - - OpenBSD-Regress-ID: c44fa5cdb434375a8b5545fdb4fc651061afca1f - -commit b49875428cda9c16c5bd52552100da2b419cda5f -Author: dtucker@openbsd.org -Date: Mon Mar 3 06:53:09 2025 +0000 - - upstream: Add %-token and environment variable expansion to SetEnv. - - feedback deraadt@ jmc@, nits and ok djm@ - - OpenBSD-Commit-ID: 2f6e5070481cb73e6f35fd1c6608c1eeff88a5c1 - -commit b6bba67e6c31d268480773e4fed16d0a32b4218e -Author: djm@openbsd.org -Date: Sun Mar 2 22:44:00 2025 +0000 - - upstream: fix PerSourcePenalty incorrectly using "crash" penalty when - - LoginGraceTime was exceeded. Reported by irwin AT princeton.edu via bz3797 - - OpenBSD-Commit-ID: 1ba3e490a5a9451359618c550d995380af454d25 - -commit 38d69fee1b06948f160d94abd07b6b297630d30a -Author: Damien Miller -Date: Sun Mar 2 22:06:53 2025 +1100 - - include __builtin_popcount replacement function - - Some systems/compilers lack __builtin_popcount(), so replace it as - necessary. Reported by Dennis Clarke; ok dtucker@ - -commit c94138d02a45dda5015f38f5a60b0bdde29019c1 -Author: djm@openbsd.org -Date: Sun Mar 2 11:03:13 2025 +0000 - - upstream: whitespace - - OpenBSD-Commit-ID: 1bd8953a37451ef7e0991f9fceec5e8005fe986a - -commit 65d2c59628e68e166046efa69e76c1d395a8df6e -Author: dtucker@openbsd.org -Date: Sun Mar 2 07:02:49 2025 +0000 - - upstream: Make a copy of the user when handling ssh -l, so that - - later during User token expansion we don't end up freeing a member of argv. - Spotted by anton@'s regress tests. - - OpenBSD-Commit-ID: 2f671a4f5726b66d123b88b1fdd1a90581339955 - -commit bd30cf784d6e825ef71592fb723c41d4f2fd407b -Author: dtucker@openbsd.org -Date: Sat Mar 1 06:11:26 2025 +0000 - - upstream: Allow %-token and environment variable expansion in User, - - with the exception of %r and %C which are self-referential. Requested in - bz#3477, ok djm@, man page improvements jmc@ - - OpenBSD-Commit-ID: caeb46251ee073662f6f5864c6f7b92d8ac80fa8 - -commit 94f59dcfc57f95ae044f75c3ce544329c8956c35 -Author: Darren Tucker -Date: Sat Mar 1 10:28:59 2025 +1100 - - Rebuild config files if Makefile changes. - - This ensures paths are updated if they are changed by re-running configure. - Patch from rapier at psc.edu. - -commit 982eb7c48df28109b8f0c1f32dfef003f64493bb -Author: Chris Rapier -Date: Wed Feb 26 16:23:30 2025 -0500 - - Update SECURITY.md - -commit 6be670656aa23fe99bbebbdb73bc114f2409e707 -Author: Chris Rapier -Date: Wed Feb 26 16:23:06 2025 -0500 - - Update SECURITY.md - -commit dfd9880585db1570656022f9fe1519df673f7b8a -Author: Darren Tucker -Date: Wed Feb 26 18:16:03 2025 +1100 - - Check for le32toh, le64toh, htole64 individually. - - It appears that at least some versions of endian.h in glibc do not have - the latter two, so check for and replace each one individually. - bz#3794, ok djm@ - -commit cb99e8eb228df366af33f4fe88d7a9dd0dbf0756 -Author: djm@openbsd.org -Date: Tue Feb 25 06:25:30 2025 +0000 - - upstream: ressurect fix for "match invalid-user" that got clobbered - - by 1.423 - - OpenBSD-Commit-ID: d18bf0945976e0f3467d710d4bc8bdbe181c0567 - -commit 487cf4c18c123b66c1f3f733398cd37e6b2ab6ab -Author: deraadt@openbsd.org -Date: Fri Feb 21 18:22:41 2025 +0000 - - upstream: Also prohibit , (comma) in hostnames, proposed by David - - Leadbeater ok djm millert - - OpenBSD-Commit-ID: 2837fa31dc6e81976f510f0a259edaa559b20b07 - -commit 3bc6de98c830bd5207f6c371ba69c5874f06305b -Author: Damien Miller -Date: Mon Feb 24 17:27:50 2025 +1100 - - Try to fix github tcmalloc target failure - - tcmalloc may, depending on the stacktrace generator it uses, create - pipe(2) fds during shared library initialisation. These will later - get clobbered by ssh/sshd calling closefrom() and chaos will ensue. - Tell tcmalloc to use an unwinder that doesn't pull this stuff. - -commit 922e54bbfe8c8479453693ef52350338f0c19124 -Author: Damien Miller -Date: Fri Feb 21 13:44:35 2025 +1100 - - cleanup last mention of ubuntu-20.04 - -commit bc4b3f6dc1738d389e5c9dcca8c56d7e153fee49 -Author: Damien Miller -Date: Fri Feb 21 13:44:13 2025 +1100 - - prune gcc/clang versions to be tested - - Test only the oldest and latest versions of each - -commit 94b73755f931d592a612ef5cb998694643eab5ff -Author: Damien Miller -Date: Fri Feb 21 11:30:22 2025 +1100 - - Update AWS-LC version number - - Patch from Shubham Mittal bz bz3792 - -commit 6887099fae6d9f3482e1075d034e9343dc413200 -Author: Damien Miller -Date: Fri Feb 21 11:22:34 2025 +1100 - - adjust workflows for ubuntu version transition - - remove workflows for unsupported compilers, add a few for additional - supported compilers, move some workflows to run on ubuntu-latest - -commit 33bb47e6f74f2ca8093946e6f462d655a9ae46d3 -Author: Damien Miller -Date: Thu Feb 20 17:10:32 2025 +1100 - - Add ubuntu-*-arm test runners - -commit a0c95fbb215b2168fa51b15906e2d6990d7fef6b -Author: Damien Miller -Date: Thu Feb 20 17:03:28 2025 +1100 - - remove ubuntu-20.04 Github action runners - - ubuntu-20.04 is deprecated now, so migrate all its unique runners - to ubuntu-22.04. - - ok dtucker@ - -commit eaba0781198f75e2ad62497e855285ec09ec7870 -Merge: 5294d009e 122d44157 -Author: Chris Rapier -Date: Tue Feb 18 16:12:42 2025 -0500 - - Merge pull request #113 from rapier1/security_hpnssh_18.6.2-9.9p2 - - HPN-SSH 18.6.2 for OpenSSH 9.9p2. Security release. - -commit 122d44157b03ac7780813dbd4a1b7d1e0e82204e -Author: Chris Rapier -Date: Tue Feb 18 15:43:44 2025 -0500 - - Remove .guthub/ci-status.md as that's for OpenSSH only - -commit d530a8e6c72c34c26d6d5285d38a165d4006a1f7 -Merge: 5294d009e d76b26751 -Author: Chris Rapier -Date: Tue Feb 18 12:05:02 2025 -0500 - - Rerun autoheader to update config.h.in - -commit d76b2675116617394cd355a3437b4963a562b64d -Author: Damien Miller -Date: Tue Feb 18 19:15:08 2025 +1100 - - autogenerated files for release - -commit 6ebc4dd77a479892d5ca0cd2a567a651f70aad82 -Author: Damien Miller -Date: Tue Feb 18 19:03:42 2025 +1100 - - openssh-9.9p2 - -commit 0cbeedba81b57c56379e1d202b9ccd3b72af7ddc -Author: Damien Miller -Date: Tue Feb 18 19:03:42 2025 +1100 - - openssh-9.9p2 - -commit 38df39ecf278a7ab5794fb03c01286f2cfe82c0d -Author: djm@openbsd.org -Date: Tue Feb 18 08:02:48 2025 +0000 - - upstream: Fix cases where error codes were not correctly set - - Reported by the Qualys Security Advisory team. ok markus@ - - OpenBSD-Commit-ID: 7bcd4ffe0fa1e27ff98d451fb9c22f5fae6e610d - -commit 5e07dee272c34e193362fba8eda0e3c453f3c773 -Author: djm@openbsd.org -Date: Tue Feb 18 08:02:12 2025 +0000 - - upstream: Don't reply to PING in preauth phase or during KEX - - Reported by the Qualys Security Advisory team. ok markus@ - - OpenBSD-Commit-ID: c656ac4abd1504389d1733d85152044b15830217 - -commit 0832aac79517611dd4de93ad0a83577994d9c907 -Author: djm@openbsd.org -Date: Tue Feb 18 08:02:48 2025 +0000 - - upstream: Fix cases where error codes were not correctly set - - Reported by the Qualys Security Advisory team. ok markus@ - - OpenBSD-Commit-ID: 7bcd4ffe0fa1e27ff98d451fb9c22f5fae6e610d - -commit 6ce00f0c2ecbb9f75023dbe627ee6460bcec78c2 -Author: djm@openbsd.org -Date: Tue Feb 18 08:02:12 2025 +0000 - - upstream: Don't reply to PING in preauth phase or during KEX - - Reported by the Qualys Security Advisory team. ok markus@ - - OpenBSD-Commit-ID: c656ac4abd1504389d1733d85152044b15830217 - -commit 9e5bd74a85192c00a842f63d7ab788713b4284c3 -Author: jmc@openbsd.org -Date: Sat Feb 15 06:48:56 2025 +0000 - - upstream: - use \& when contructs like "e.g." end a line, to avoid - - double spacing - macro is Qq not Oq - - OpenBSD-Commit-ID: 17e5d2d7f288cc7fc536e3af252224525f9fb43a - -commit f519e71fb7a46314ae16e2a75490649dc0bd01a2 -Author: Damien Miller -Date: Sat Feb 15 13:12:40 2025 +1100 - - depend - -commit 9131ac64b0ebe66dc1de9d44bf8d1bd64a24c350 -Author: djm@openbsd.org -Date: Sat Feb 15 01:52:07 2025 +0000 - - upstream: add "Match version" support to ssh_config. Allows - - matching on the local version of OpenSSH, e.g. "Match version OpenSSH_10.*" - - ok markus@ - - OpenBSD-Commit-ID: c0cb504d0b9e43ccf12e68a544a7cd625e89758d - -commit 192a20df00c8a56fe7d92ffa23d959c865d7fb9e -Author: djm@openbsd.org -Date: Sat Feb 15 01:50:47 2025 +0000 - - upstream: Add support for "Match sessiontype" to ssh_config. Allows - - matching on the type of session requested, either "shell" for interactive - sessions, "exec" for command execution sessions, "subsystem" for subsystem - requests, such as sftp, or "none" for transport/forwarding-only sessions. - - ok markus@ - - OpenBSD-Commit-ID: eff5c001aecb2283d36639cfb28c0935a8bfd468 - -commit caa3c0c77082888236b0b0c4feb3e6879731b3ba -Author: djm@openbsd.org -Date: Sat Feb 15 01:48:30 2025 +0000 - - upstream: "Match command ..." support for ssh_config to allow - - matching on the remote command specified on the commandline. - - Also relaxes matching rules for `Match tagged` to allow - `Match tagged ""` to match an empty tag value. This also works - for command. - - ok markus@ - - OpenBSD-Commit-ID: 00dcfea425bf58d824bf5e3464cfc2409121b60d - -commit fb071011fb843142282b8b8a69cbb15e9b0b9485 -Author: djm@openbsd.org -Date: Mon Feb 10 23:00:29 2025 +0000 - - upstream: fix "Match invalid-user" from incorrectly being activated - - in initial configuration pass when no other predicates were present on the - match line - - OpenBSD-Commit-ID: 02703b4bd207fafd03788bc4e7774bf80be6c9a8 - -commit 38f6000e9851a00e2e4b8e1eb4ea6a243ef7e6a3 -Author: Damien Miller -Date: Tue Feb 11 10:32:26 2025 +1100 - - depend - -commit aa1409e7a0a5605f0127651a3ba5a348666325bc -Author: djm@openbsd.org -Date: Mon Feb 10 23:19:26 2025 +0000 - - upstream: include arguments the command was invoked with, and - - operating system name, version and architecture in startup debugging output; - ok dtucker - - OpenBSD-Commit-ID: 2a509d319aaf31a6bf9998e1842832883fbc3edd - -commit 857ac20f5fe19f183defba5dbf4b7d9e6400230c -Author: djm@openbsd.org -Date: Mon Feb 10 23:16:51 2025 +0000 - - upstream: include line number in Match debug messages, makes it a - - little easier to see what's going on - - OpenBSD-Commit-ID: 1fcf4aa2ee667711b9497ded0fa52d757c69b1df - -commit af49d474e481d2d78b2f06b06a06b0b37629358e -Author: djm@openbsd.org -Date: Mon Feb 10 23:00:29 2025 +0000 - - upstream: fix "Match invalid-user" from incorrectly being activated - - in initial configuration pass when no other predicates were present on the - match line - - OpenBSD-Commit-ID: 02703b4bd207fafd03788bc4e7774bf80be6c9a8 - -commit 1c67bae3f5834e48ded71c406f2039dea6e536db -Author: schwarze@openbsd.org -Date: Sun Feb 9 18:24:08 2025 +0000 - - upstream: In a section 1 manual, use the plain English words - - "standard output" rather than the overly technical abbreviation "stdout" - we - are not talking about a device file or a FILE * object here. Issue reported - by on the groff mailing list. - - OpenBSD-Commit-ID: a0816999f970e6159523bed8484f62c42ec93109 - -commit 85b3d68dd931416ede657f371f1d60cdc3a66f34 -Author: dtucker@openbsd.org -Date: Fri Jan 17 00:09:41 2025 +0000 - - upstream: Fix debug logging of user specific delay. Patch from - - Achim Leitner (fjl5) via github PR#552. - - OpenBSD-Commit-ID: 834a869ed9b15058d3c1ef0cd75402ef989255d8 - -commit e4e5b06fdf4532705669c0ae944b364022d16b9d -Author: dtucker@openbsd.org -Date: Thu Jan 16 06:37:10 2025 +0000 - - upstream: Call log_init in sshd-auth and sshd-session immediately - - after parsing the config file so that any log settings set in the config file - take effect immediately. Move version banners to immediately after that, and - make them distinct per binary. ok djm@ - - OpenBSD-Commit-ID: acf3d090638edf9b6e6f78eed96b537fe671f0f5 - -commit 0643994b20f2cc54bca80842a984b3052ff1a6a9 -Author: dtucker@openbsd.org -Date: Wed Jan 15 22:23:13 2025 +0000 - - upstream: Use strprefix helper when processing sshd -C test args - - instead of counting bytes by hand. ok djm@ - - OpenBSD-Commit-ID: 2866d369d96fe04bf76112260ac37e489f98a9a9 - -commit 66efd0fbb6b8b95f8a520f2cdf8ede14e62b30b3 -Author: Damien Miller -Date: Thu Feb 6 09:38:09 2025 +1100 - - add support for AWS-LC (AWS libcrypto) - - Patch from Shubham Mittal via bz3784; ok dtucker - -commit 5294d009efa4892f0a28123dffe80b7c6dee64db -Merge: c3eebd9df e00cd6e24 -Author: Chris Rapier -Date: Thu Jan 30 17:09:43 2025 -0500 - - Merge pull request #111 from rapier1/bug_remove_configure - - Crank version number to 18.6.1 - -commit e00cd6e2498435a7e57a7b9c20f4124b80548592 -Author: Chris Rapier -Date: Thu Jan 30 17:09:02 2025 -0500 - - Crank version numbver to 18.6.1 - -commit c3eebd9df3d1969121e21affc603db512f4ce8cc -Author: Chris Rapier -Date: Thu Jan 30 17:04:27 2025 -0500 - - Configure script removed from repo. - - We should not have a prebuilt configure script in our - repo. All user must run autoconf before building hpnssh. - - I figured this out with input from iam-TJ from github. - Thank you! - -commit 826483d51a9fee60703298bbf839d9ce37943474 -Author: Tim Rice -Date: Mon Dec 16 15:36:54 2024 -0800 - - fix old typo (s/SYSVINITSTOPT/SYSVINITSTOP/) - -commit 1a8ce460f1d0c3f7304edba0733783b57b430e21 -Author: dtucker@openbsd.org -Date: Thu Dec 12 09:09:09 2024 +0000 - - upstream: Plug leak on error path, spotted by Coverity. ok djm@ - - OpenBSD-Commit-ID: b1859959374b4709569760cae0866d22a16606d3 - -commit 924f996144fc0ae1a659fadcfc2237d1ae935fc4 -Author: Xavier Hsinyuan -Date: Mon Dec 9 11:21:05 2024 +0800 - - Add $(srcdir) for standalone sk-libfido2 make target. - - Fix out-of-tree build failure due to incorrect path for `sk-usbhid.c`. - -commit bbc9c18e84de29c83fa03e69290979fcca54a2b2 -Author: djm@openbsd.org -Date: Sat Dec 7 10:12:19 2024 +0000 - - upstream: replace bespoke logging of MaxSessions enforcement with - - new ratelimited logging infrastructure. - - Add ratelimits to logging of connections dropped by PerSourcePenalties - - ok dtucker - - OpenBSD-Commit-ID: f22fe7c39607e4361aadf95e33773ffd68c59489 - -commit 5a6ddf946cf105189c2c99a04f86ce95edc55fc5 -Author: djm@openbsd.org -Date: Sat Dec 7 10:05:36 2024 +0000 - - upstream: add infrastructure for ratelimited logging; feedback/ok - - dtucker - - OpenBSD-Commit-ID: 18a83e5ac09d59aaf1e834fd6b796db89dd842e7 - -commit 85f0c1e75e8f6c5d83b8070918ee2f6ab16d403e -Author: djm@openbsd.org -Date: Fri Dec 6 16:24:27 2024 +0000 - - upstream: allow glob(3) patterns for sshd_config AuthorizedKeysFile - - and AuthorizedPrincipalsFile directives; bz2755 ok dtucker - - OpenBSD-Commit-ID: 3e3e05a17fca39bba78b993a07b44664519adf7f - -commit 9a9ffee6e10bcd039f1f9385599577441ebe542a -Author: djm@openbsd.org -Date: Fri Dec 6 16:21:48 2024 +0000 - - upstream: support VersionAddendum in the client, mirroring the - - option of the same name in the server; bz2745 ok dtucker@ - - OpenBSD-Commit-ID: 6ff7905b3f9806649bde750515786553fb89cdf4 - -commit 41ab0ccecd68232e196efae5e224b31ca104c423 -Author: djm@openbsd.org -Date: Fri Dec 6 16:02:12 2024 +0000 - - upstream: clarify encoding of options/extensions; bz2389 - - OpenBSD-Commit-ID: c4e92356d44dfe6d0a4416deecb33d1d1eba016c - -commit 5488810359f0fd91e2f7b919c70a3798e46376cb -Author: djm@openbsd.org -Date: Fri Dec 6 15:17:15 2024 +0000 - - upstream: ignore SIGPIPE here; some downstreams have had this for - - years... - - OpenBSD-Commit-ID: 73674ee4f8ceb8fc9cb8de71d8ddea0c721eb035 - -commit 4389a792d9078212366eba124a3eed36e009d09e -Author: djm@openbsd.org -Date: Fri Dec 6 15:12:56 2024 +0000 - - upstream: sync -o option lists with ssh.1; requested jmc@ - - OpenBSD-Commit-ID: a7ac295b444da7b2ca7a33a52370594f6897f6bb - -commit 6b9cd095565ddc5402d5096dce248fa0521dbda3 -Author: Fabio Pedretti -Date: Mon Oct 16 17:12:24 2023 +0200 - - Remove ancient RHL 6.x config in RPM spec. - - It looks like build6x options were intended for RHL 6.x - (the Red Hat distro predating Fedora, not RHEL), but were - then applied to RHEL. - - Completely remove support for this ancient configuration. - - Successfully built, installed and run on RHEL 6. This also - remove a build warning about deprecation of PreReq. - -commit 5cacfa798f92b707491375fed748d1d1bcb33ec9 -Author: Darren Tucker -Date: Fri Dec 6 23:54:45 2024 +1100 - - Add new hardware-backed signing key for myself. - - Retire old non-hardware based signing key. - -commit f129b6ee1d4361799e65307216e3a4d5544356b7 -Author: Jonas 'Sortie' Termansen -Date: Sat Nov 2 22:05:45 2024 +0100 - - Fix configure implicit declaration and format warnings. - -commit 11a5e5179077f73c2d45bcdf3f60153ae3f17815 -Author: dtucker@openbsd.org -Date: Fri Dec 6 07:05:54 2024 +0000 - - upstream: Expand $SSH to absolute path if it's not already. - - Prevents problem later in increase_datafile_size if ssh is not in - the path. Patch from quaresmajose via GHPR#510. - - OpenBSD-Regress-ID: 2670a66af8b827410ca7139f0a89f4501cece77b - -commit dc2ef8f0944a4ff7ba19e52fd17b4654e6bd9b93 -Author: dtucker@openbsd.org -Date: Fri Dec 6 06:55:28 2024 +0000 - - upstream: Change "login again" to "log in again" - - in password change message. From ThinLinc-Zeijlon via github PR#532. - - OpenBSD-Commit-ID: fea5e9bc04caf613a118c419f16863733b340cf1 - -commit 8252f346eb21cd6b30816f905b7d94f10962373e -Author: naddy@openbsd.org -Date: Thu Dec 5 22:45:03 2024 +0000 - - upstream: catch up documentation: AES-GCM is preferred to AES-CTR - - OpenBSD-Commit-ID: 63360924b6834507fe70020edb936f5075043a9e - -commit 9a2f4c75081769bd45eba2bf3fab0a32b25f1879 -Author: Darren Tucker -Date: Fri Dec 6 17:56:17 2024 +1100 - - Change text from "login to" to "log in to". - - From ThinLinc-Zeijlon via GHPR#532. - -commit 24dcf368d816b06136a02845ebd0c7846bf18927 -Author: Xavier Hsinyuan -Date: Fri Dec 6 11:56:34 2024 +0800 - - Fix configure message typo in sk-libfido2 standalone. - -commit 1a0cac2f3411a22d69ae6918eff48456b805e73b -Author: Alexander Kanavin -Date: Thu Dec 5 16:26:46 2024 +0100 - - Skip 2038 key expiry test on 64 bit time_t systems. - - This allows testing Y2038 with system time set to after that (i.e. 2040), - so that actual Y2038 issues can be exposed, and not masked by key expiry - errors. - - Signed-off-by: Alexander Kanavin - -commit 6b4611dc1232c5d2c8e43201f580f19aab320c87 -Author: Darren Tucker -Date: Fri Dec 6 01:45:52 2024 +1100 - - Skip 64bit expiry time test on 32bit time_t. - -commit c9b7866a7dc5e6c30f5aa9d22dd0bbafda0d496f -Author: dtucker@openbsd.org -Date: Thu Dec 5 14:28:39 2024 +0000 - - upstream: Add key expiry test in the 64bit time_t range for additional - - coverage. From Alexander Kanavin via bz#3684. - - OpenBSD-Regress-ID: bdf6eb3c2421f2e1e11483d03b34c7931d1bccf7 - -commit 790c913b5fc6ee93ae14793443dc85a0f574b7eb -Author: Damien Miller -Date: Thu Dec 5 19:24:56 2024 +1100 - - typo - -commit d23a23aaeeabc228792e3fd7eb5f2fa6ae13c482 -Author: Damien Miller -Date: Thu Dec 5 08:47:02 2024 +1100 - - add a Makefile target for ssh-verify-attestation - - Not built by default, but easier than doing it by hand - -commit d0ac63d0f8b5f778d5fd326701ef4489bc27635e -Author: dtucker@openbsd.org -Date: Thu Dec 5 06:49:26 2024 +0000 - - upstream: De-magic the x11 base port number into a define. ok djm@ - - OpenBSD-Commit-ID: 23b85ca9d222cb739b9c33ee5e4d6ac9fdeecbfa - -commit 9998c93d57bf0f1df2bc93e0bc2d8112c6f8c720 -Author: dtucker@openbsd.org -Date: Thu Dec 5 06:47:00 2024 +0000 - - upstream: Prevent integer overflow in x11 port handling. These are - - theoretically possible if the admin misconfigures X11DisplayOffset or the - user misconfigures their own $DISPLAY, but don't happen in normal operation. - From Suhov Roman via bz#3730, ok djm@ - - OpenBSD-Commit-ID: e9e3860f1a19b862ccf07dc8ecbe8f1e1034f4ed - -commit 8c9ee046d40e4254c6c1711783ea11027b72c3e9 -Author: djm@openbsd.org -Date: Wed Dec 4 16:42:49 2024 +0000 - - upstream: add a work-in-progress tool to verify FIDO attestation - - blobs that ssh-keygen can write when enrolling FIDO keys. - - OpenBSD-Regress-ID: 6c97bf3f46e48866677ad69f54b77683eb92437f - -commit 50c640d874d0246dd0a0d949398c3d7f757c716a -Author: dtucker@openbsd.org -Date: Wed Dec 4 10:51:13 2024 +0000 - - upstream: Don't assume existence of SK provider in test. Patch from - - balu.gajjala at gmail via bz#3402. - - OpenBSD-Regress-ID: d571932016d07d135b54433d07520b9e1901db43 - -commit 73d782693144262570d3585b62f16b183170c014 -Author: djm@openbsd.org -Date: Wed Dec 4 14:37:55 2024 +0000 - - upstream: sync the list of options accepted by -o with ssh_config.5 - - prompted by bz3455 - - OpenBSD-Commit-ID: 0ecbfa70aea6c769bcc259defe07182edf461f57 - -commit 6993d9f0959534b0b7d52e17b95e9e79fb0b3d0a -Author: djm@openbsd.org -Date: Wed Dec 4 14:24:20 2024 +0000 - - upstream: don't screw up ssh-keygen -l output when the file - - contains CR characters; GHPR236 bz3385, fix from Dmitry Belyavskiy - - OpenBSD-Commit-ID: e458cf6b0adcea5b69ef4c7ba38e590841d02ef4 - -commit c0b03c2534946fc114880092177aa4a3683ced2d -Author: jsg@openbsd.org -Date: Tue Dec 3 22:30:03 2024 +0000 - - upstream: spelling; ok djm@ - - OpenBSD-Commit-ID: c8ff3f70020451eef214e598117b7ce1a29853ef - -commit 97eb247f40167f44324e88a537d5b4fe771a63b2 -Author: dtucker@openbsd.org -Date: Tue Dec 3 16:27:53 2024 +0000 - - upstream: Remove fallback to compiled-in gropup for dhgex when the - - moduli file exists, but does not contain moduli within the client-requested - range. The fallback behaviour remains for the case where the moduli file does - not exist (typically, running tests prior to installing). From bz#2793, based - in part on patch from Joe Testa, ok djm@ - - OpenBSD-Commit-ID: b1a8c5dbbedf249b42474679ebaf14db7332b1ab - -commit 30c746265ebde29806dba77c92fb1fd3803cbf5c -Author: tb@openbsd.org -Date: Tue Dec 3 15:53:51 2024 +0000 - - upstream: Remove redundant field of definition check - - This will allow us to get rid of EC_GROUP_method_of() in the near future. - - ok djm - - OpenBSD-Commit-ID: b4a3d2e00990cf5c2ec6881c21ddca67327c2df8 - -commit eaa1744f34c30740328fd0a0d84b5f2f9e6918c1 -Author: Damien Miller -Date: Thu Dec 5 00:59:19 2024 +1100 - - don't ignore changes in regress Makefiles - - reported by Torben Hansen in bz2880 - -commit 66e986880b2472fefaad781f10113b138b65ff27 -Author: Damien Miller -Date: Thu Dec 5 00:01:33 2024 +1100 - - Support systemd-style socket activation in agent - - Adds support for systemd LISTEN_PID/LISTEN_FDS socket activation to - ssh-agent. Activated when these environment variables are set and - the agent is started with the -d or -D option and no socket path - is set. - - Based on GHPR502 by Daniel Kahn Gillmor, ok dtucker - -commit 9b57c099f57152e6c94f633c114f544087f4bdaa -Author: Darren Tucker -Date: Wed Dec 4 21:36:01 2024 +1100 - - Update readme files to better reflect reality. - - Prompted by bz#3738, ok djm@. - -commit ffa885db1b960451d426455045d2f51288e48ee8 -Author: dtucker@openbsd.org -Date: Tue Dec 3 14:12:47 2024 +0000 - - upstream: Improve description of KbdInteractiveAuthentication. - - Based on bz#3658, fixes jmc@ ok markus@ djm@. - - OpenBSD-Commit-ID: 9fadb56b9afed554d501acbba911c685acd6ffc2 - -commit b460f82a67795bba37c6cc6c78f788e5b435b4cb -Author: Jonas 'Sortie' Termansen -Date: Sat Nov 2 17:53:23 2024 +0100 - - Inherit DESTDIR from the environment. - - autoconf packages conventionally inherit the DESTDIR variable from the - environment. - -commit 9da7fa7c7464df241ae5d17da94e4ebed9013719 -Author: Jonas 'Sortie' Termansen -Date: Sat Nov 2 22:10:39 2024 +0100 - - Define u_short and u_long if needed. - -commit d3a7ff7cecbc23cc37044bdf02e7118d05bf3c35 -Author: djm@openbsd.org -Date: Tue Dec 3 08:31:49 2024 +0000 - - upstream: support FIDO tokens that return no attestation data, e.g. - - recent WinHello. From Michael Braun via GHPR542 - - OpenBSD-Commit-ID: a71b0542f2f7819ba0e33a88908e01b6fc49e4ce - -commit 96b64056c812620014b65371a9e3ac86bfcd08d5 -Author: Thorsten Kukuk -Date: Tue Nov 19 10:53:28 2024 +0100 - - Add wtmpdb support as Y2038 safe wtmp replacement - -commit 1d9563a56f2ad5b0c0aeef20e19c1a03ad54f88a -Author: djm@openbsd.org -Date: Mon Dec 2 14:06:42 2024 +0000 - - upstream: unbreak - - OpenBSD-Commit-ID: 05b6c31f4a6e385338f43cc0e08776cea75802a1 - -commit d75837b9f6d0d6cc18ed5078789ea0f3dad08f00 -Author: djm@openbsd.org -Date: Mon Dec 2 13:37:18 2024 +0000 - - upstream: prefer AES-GCM to AES-CTR; ok deraadt markus - - OpenBSD-Commit-ID: 8366a72e0f300ee31c5dab2c95025387ec15bbc9 - -commit e19cd494b567a73dc390e09b47c1e21545e6116b -Author: Shiva Kaul -Date: Mon Dec 2 02:04:20 2024 -0500 - - Fix compilation with DEBUG_SK enabled - - In `ssh_ecdsa_sk_verify`, the `datalen` variable was renamed to `dlen` -- but not in this debugging block. - -commit 67ace92be0718df7e0f52c0a76684fc2ebae4089 -Author: dtucker@openbsd.org -Date: Fri Nov 29 00:13:36 2024 +0000 - - upstream: Import regenerated moduli. - - OpenBSD-Commit-ID: 311d271bf0fab8a119e84f4f696d8cd40731692f - -commit ca0697a90e5720ba4d76cb0ae9d5572b5260a16c -Author: Jeremy Stott -Date: Sat Oct 19 12:10:52 2024 +1300 - - Add make target for standalone sk-libfido2 - - Add a Makefile target for sk-libfido2, the standalone fido2 security - key shared library, suitable for use with the SecurityKeyProvider - option. - - Add a new configure option `--with-security-key-standalone` that - optionally sets the shared library target sk-libfido2$(SHLIBEXT), and - adds it to $(TARGETS). - - misc.h is required when SK_STANDALONE is defined, because of the use - of `monotime_tv` in `sk_select_by_touch`. - - Sets the shared library extension for sk-libfido2 is by setting - `SHLIBEXT` depending on the platform in configure.ac. - - Add the shared library to the CI builds in the `sk` target config to - make sure it can compile under the same conditions as - `--with-security-key-builtin`. - - Add a libssh-pic.a static library that compiles with `-fPIC` reusing - .c.lo method in sk-dummy.so for use in the shared library sk-libfido2. - - Note, a separate static library libssh-pic.a is needed, since defining - -DSK_STANDALONE excludes some symbols needed in sshkey.lo. - -commit 74d70841efbf41b9fcc8e6f6f4777d2e9d7e2004 -Author: Arnout Engelen -Date: Fri Oct 18 13:42:38 2024 +0200 - - mdoc2man: balance nested square brackets - - I noticed the square brackets in `destination [command [argument...]` - in the synopsis for the `ssh.1` manpage were not balanced, - this balances them. - - Signed-off-by: Arnout Engelen - -commit 8eabd2ae2ca1d7756417a1ee5b41f09c5d997634 -Author: djm@openbsd.org -Date: Wed Nov 27 16:07:08 2024 +0000 - - upstream: fix argument of "Compression" directive in ssh -G config - - dump, which used to work but broke in 9.8 - - OpenBSD-Commit-ID: c79936242d29c70d01941b28d2d07fd0b85fe46f - -commit 53c03961769d8879a81398074ea3cb36253d4f2e -Author: djm@openbsd.org -Date: Wed Nov 27 13:27:34 2024 +0000 - - upstream: new name/link for agent I-D - - OpenBSD-Commit-ID: e3420f3925a297a1b2ab7dfe7c7d274cfc8e1193 - -commit 785e3c9110df8f2d30e42ce8b45969c49700f35b -Author: djm@openbsd.org -Date: Wed Nov 27 13:00:23 2024 +0000 - - upstream: mention that biometrics may be used for FIDO key user - - verification as well as PIN. Prompted by Zack Newman, ok jmc@ - - OpenBSD-Commit-ID: b774a4438c9be70012661ee278450790d21277b8 - -commit fd2e64c9ec9ea3e89e396be0db41aaf982ae1210 -Author: djm@openbsd.org -Date: Tue Nov 26 22:05:51 2024 +0000 - - upstream: g/c outdated XXX comments - - OpenBSD-Commit-ID: 74d0c0b74994d9a4343c4d7ea4948cb34f609a6c - -commit 0ad34a6193357d286042322ea7347262a6fb0778 -Author: djm@openbsd.org -Date: Tue Nov 26 22:02:28 2024 +0000 - - upstream: regression test for UpdateHostkeys with multiple keys backed - - by ssh-agent. Patch from Maxime Rey. - - OpenBSD-Regress-ID: 1777ab6e639e57c0e20cbcb6df60455b49fd8bb3 - -commit 84023656d91b78f1ef86c8321ec563f2e90f7227 -Author: djm@openbsd.org -Date: Tue Nov 26 22:01:37 2024 +0000 - - upstream: Explicitly specify the signature algorithm when signing - - hostkeys-prove requests. - - Fixes a corner-case triggered by UpdateHostKeys with one or more unknown - host keys stored in ssh-agent where sshd refuses to accept the signature - coming back from the agent. - - Report/fix from Maxime Rey - - OpenBSD-Commit-ID: 460c7d527a24f92b7e5f68ca1a2fa242ebf0d086 - -commit d1c1cfc5e4e9b43593d4642810ea8135e4c7db49 -Author: djm@openbsd.org -Date: Tue Nov 26 21:23:35 2024 +0000 - - upstream: when using RSA keys to sign messages, select the - - signature algorithm based on the requested hash algorithm ("-Ohashalg=xxx"). - - This allows using something other than rsa-sha2-512, which may not - be supported on all signing backends, e.g. some smartcards only - support SHA256. - - Patch from Morten Linderud; ok markus@ - - OpenBSD-Commit-ID: 246353fac24e92629263996558c6788348363ad7 - -commit ac7544654441280071b90a4129a47467d40f2389 -Author: djm@openbsd.org -Date: Sun Nov 24 23:47:50 2024 +0000 - - upstream: turn off CDIAGFLAGS and turn back on INSTALL_STRIP - - accidentally changed in last commit - - OpenBSD-Commit-ID: 6d07e4606997e36b860621a14dd41975f2902f8f - -commit 953fa5b59afb04c3c74ed82d7bace65c13cd8baa -Author: Darren Tucker -Date: Sat Nov 9 11:41:44 2024 +1100 - - Disable security key for bigendian interop. - - It doesn't currently work. It's not clear why, but I suspect - sk-dummy.so ends up being built for the wrong architecture. - -commit a80eb71c428c474098087c672398f200be8fabdf -Author: Darren Tucker -Date: Sat Nov 9 05:14:16 2024 +1100 - - Reshuffle OpenWRT test configs. - - Move the the flags used by the OpenWRT distro to mipsel target and - enable OpenSSL on all targets to improve coverage. - - Explicitly disable security key and openssl on mips target so that host - end of the bigendian interop tests don't attempt them and fail (since - they're not enabled on the target side). - -commit d2709c461359e4129311cdff81ee05242d6c53cd -Author: Darren Tucker -Date: Sat Nov 9 03:26:08 2024 +1100 - - Add keytype to bigendian interop test. - -commit 50ac0f0e0627d29fd9becf5e15e8ceca5ad18078 -Author: Darren Tucker -Date: Sat Nov 9 03:24:29 2024 +1100 - - Ignore chown failure, eg due to dangling symlinks. - -commit 9e528e65a03245cf28e814f09b88c701bec935d1 -Author: Darren Tucker -Date: Sat Nov 2 18:05:41 2024 +1100 - - Test bigendian interop. - - Where our test target is a bigendian system, do an additional build on - the runner host (which is little endian) and test interop between the two. - Should hopefully catch obvious endianness bugs. - -commit dd416f5bfa96ac1ff44b27a93f7b55ee627c6baf -Author: Darren Tucker -Date: Fri Nov 1 19:44:29 2024 +1100 - - Allow overridding TEST_SSH_SSHD. - - This will allow tests to specify an alternative sshd, eg on a remote - machine with different endianness. - -commit 82662d562cf54829df8a941cdfb2fd307e1d9a90 -Author: djm@openbsd.org -Date: Wed Nov 6 22:51:26 2024 +0000 - - upstream: ssh-agent implemented an all-or-nothing allow-list of - - FIDO application IDs for security key-backed keys, to prevent web key handles - from being used remotely as this would likely lead to unpleasant surprises. - By default, only application IDs that start with "ssh:*" are allowed. - - This adds a -Owebsafe-allow=... argument that can override the default - list with a more or less restrictive one. The default remains unchanged. - - ok markus@ - - OpenBSD-Commit-ID: 957c1ed92a8d7c87453b9341f70cb3f4e6b23e8d - -commit 593a0b65c55c1e06a8c22b084aefc395aedb0127 -Author: jca@openbsd.org -Date: Mon Nov 4 21:59:15 2024 +0000 - - upstream: Ignore extra groups that don't fit in the buffer passed - - to getgrouplist(3) - - Our kernel supports 16 groups (NGROUPS_MAX), but nothing prevents - an admin from adding a user to more groups. With that tweak we'll keep - on ignoring them instead of potentially reading past the buffer passed to - getgrouplist(3). That behavior is explicitely described in initgroups(3). - - ok millert@ gilles@ - - OpenBSD-Commit-ID: a959fc45ea3431b36f52eda04faefc58bcde00db - -commit e7adebeff3a9d038d0eaeeb0fcefedf29acb7e90 -Author: Damien Miller -Date: Mon Nov 4 14:39:27 2024 +1100 - - Add git signing key for Tim Rice - -commit 729a26a978dd39db60d4625bdfb5405baa629e59 -Author: Damien Miller -Date: Wed Oct 30 14:25:14 2024 +1100 - - fix uint64_t types; reported by Tom G. Christensen - -commit da4b84845e874f12af7e0686170fa391c919d1df -Author: Darren Tucker -Date: Fri Nov 1 18:51:22 2024 +1100 - - Correct path to c-cpp.yml file in workflow config. - -commit 28740aa2c75392a9c4191eb9523f9b20853e2932 -Author: Darren Tucker -Date: Fri Nov 1 18:44:42 2024 +1100 - - Test new OpenSSL and LibreSSL releases.` - -commit a74809fe06540f16231b354ffe21fcbf39e81f73 -Author: Darren Tucker -Date: Fri Nov 1 18:44:00 2024 +1100 - - Add nbsd10 default test config. - -commit 88b35cbdc1500efece65cd6a9a20a72cf7e46eaa -Author: Damien Miller -Date: Wed Oct 30 14:25:14 2024 +1100 - - fix uint64_t types; reported by Tom G. Christensen - -commit 33c5f384ae03a5d1a0bd46ca0fac3c62e4eaf784 -Author: Damien Miller -Date: Sun Oct 27 13:28:11 2024 +1100 - - htole64() etc for systems without endian.h - -commit fe8d28a7ebbaa35cfc04a21263627f05c237e460 -Author: djm@openbsd.org -Date: Sun Oct 27 02:06:59 2024 +0000 - - upstream: explicitly include endian.h - - OpenBSD-Commit-ID: 13511fdef7535bdbc35b644c90090013da43a318 - -commit 11f348196b3fb51c3d8d1f4f36db9d73f03149ed -Author: djm@openbsd.org -Date: Sun Oct 27 02:06:01 2024 +0000 - - upstream: fix ML-KEM768x25519 KEX on big-endian systems; spotted by - - jsg@ feedback/ok deraadt@ - - OpenBSD-Commit-ID: 26d81a430811672bc762687166986cad40d28cc0 - -commit ef7c26cd2f0f9a8222f851d1e551f6dfd3113f8b -Author: Damien Miller -Date: Sun Oct 27 13:28:11 2024 +1100 - - htole64() etc for systems without endian.h - -commit 0c3927c45f8a57b511c874c4d51a8c89414f74ef -Author: djm@openbsd.org -Date: Sun Oct 27 02:06:59 2024 +0000 - - upstream: explicitly include endian.h - - OpenBSD-Commit-ID: 13511fdef7535bdbc35b644c90090013da43a318 - -commit cf3e48ee8ba1beeccddd2f203b558fa102be67a2 -Author: djm@openbsd.org -Date: Sun Oct 27 02:06:01 2024 +0000 - - upstream: fix ML-KEM768x25519 KEX on big-endian systems; spotted by - - jsg@ feedback/ok deraadt@ - - OpenBSD-Commit-ID: 26d81a430811672bc762687166986cad40d28cc0 - -commit ae566d51b64fa3dce7063e7745b9b35f8f47abde -Author: naddy@openbsd.org -Date: Fri Oct 25 21:53:24 2024 +0000 - - upstream: mlkem768x25519-sha256 has been promoted to default key - - exchange - - OpenBSD-Commit-ID: 5a3259a193fd42108a869ebf650b95b5f2d08dcf - -commit 3af1dba1384ca896df6e973c70398c41d36de1ea -Author: Darren Tucker -Date: Fri Oct 25 19:04:30 2024 +1100 - - Retire the minix3 test config. - - It got broken by the sshd-auth change, it's not obvious why, and the - platform lacks the debugging tools (eg gdb, strace) to figure it out. - The upstream project seems effectively dead (6 years since the last - commit, 10 since the last release). It was useful while it lasted - (we found a real bug because of it) but its time seems to have passed. - -commit 3b240cc44b8de9175280ddbe59331317d427b0e3 -Author: Preetish Amballi -Date: Mon Oct 21 14:07:02 2024 +0000 - - Updated gitignore to ignore sshd-session and sshd-auth targets - -commit 326495744f06a0ab18ee0d16f87b3fe91cac92fb -Author: Darren Tucker -Date: Fri Oct 25 19:01:02 2024 +1100 - - Simplify pselect shim and remove side effects. - - Instead of maintaing state (pipe descriptors, signal handlers) across - pselect-on-select invocations, set up and restore them each call. - This prevents outside factors (eg a closefrom or signal handler - installation) from potentially causing problems. This does result in a - drop in throughput of a couple of percent on geriatric platforms without - a native pselect due to the extra overhead. Tweaks & ok djm@ - -commit e53b615f3934ffac1efb3c1e491d126b9b09fd24 -Author: djm@openbsd.org -Date: Fri Oct 25 01:34:18 2024 +0000 - - upstream: promote mlkem768x25519-sha256 to be the default key exchange; - - ok markus@ - - OpenBSD-Commit-ID: fc673065e6505bb06b2e2b9362f78ccb4200a828 - -commit de644b1831b970f6655f871c051774cc871e8e74 -Author: djm@openbsd.org -Date: Thu Oct 24 03:28:34 2024 +0000 - - upstream: test SIGUSR1 dropping all keys from ssh-agent - - OpenBSD-Regress-ID: 8654b9aa8eb695b1499fffc408c25319592bf0e0 - -commit e86d7a077ce9a2b9ee9d4138c358a17cbdb786f9 -Author: djm@openbsd.org -Date: Thu Oct 24 03:15:47 2024 +0000 - - upstream: amake ssh-agent drop all keys when it receives SIGUSR1; - - let's users zap keys without access to $SSH_AUTH_SOCK - - ok deraadt@ - - OpenBSD-Commit-ID: dae9db0516b1011e5ba8c655ac702fce42e6c023 - -commit 94cdfebec852a2429c008cc2a55f8e4183f36972 -Author: djm@openbsd.org -Date: Thu Oct 24 03:14:37 2024 +0000 - - upstream: relax valid_domain() checks to allow an underscore as the - - first character. ok deraadt@ - - OpenBSD-Commit-ID: 3f8be6d32496e5596dd8b14e19cb067ddd7969ef - -commit 1b05d5437bf45bee5e3104772dea06ed51764f1b -Author: dtucker@openbsd.org -Date: Tue Oct 22 07:13:28 2024 +0000 - - upstream: Remove sshd logfile in start_sshd - - ... and ssh and sshd log wrappers before recreating them. Prevents "can't - create" errors during tests when running tests without SUDO after having - run them with SUDO. - - OpenBSD-Regress-ID: 2f0a83532e3dccd673a9bf0291090277268c69a6 - -commit 307ab3c7720f8879b835614b02687358ee4df9b9 -Author: dtucker@openbsd.org -Date: Tue Oct 22 06:16:26 2024 +0000 - - upstream: Add a sshd debug wrapper - - ... to run all of the subprograms from the build directory while - developing and debugging. Should help prevent accidentally testing - against unchanged installed sshd-auth and sshd-session binaries. ok djm@ - - OpenBSD-Commit-ID: 61760cdc98c2bc8f1e9f83a6f97cca0f66b52e69 - -commit 87bd1cb3ccba5e91d2650eb7f753c898ee43858e -Author: dtucker@openbsd.org -Date: Tue Oct 22 06:13:00 2024 +0000 - - upstream: Make debug call printf("%s", NULL) safe. - - Prevents problems on platforms where this isn't safe (which it's not - required to be). ok djm@ - - OpenBSD-Commit-ID: 8fa4ce3ad90915c925b81b99a79ab920b0523387 - -commit c44c349edd157b2c00c42bd5ef5f9dfb37de26f3 -Author: Darren Tucker -Date: Tue Oct 22 17:48:32 2024 +1100 - - Resync cvsid missed in commit 6072e4c9. - -commit fe4305c37ffe53540a67586854e25f05cf615849 -Author: djm@openbsd.org -Date: Fri Oct 18 05:53:26 2024 +0000 - - upstream: mention that LocalForward and RemoteForward can accept Unix - - domain socket paths; GHPR115 - - OpenBSD-Commit-ID: a8a34d0a0c51a9ddab3dfce615f9878fa76ef842 - -commit 9c97b6af8e052ab5ffe0f9096fadc8f9a4d0ed0f -Author: djm@openbsd.org -Date: Fri Oct 18 05:45:40 2024 +0000 - - upstream: remove duplicate check; GHPR392 from Pedro Martelletto - - OpenBSD-Commit-ID: 597ab7dd3f0e78939d2659fc1904d0f39ee95487 - -commit d9cd208e89a471a3ff8adfcec68d6210af9e9fd5 -Author: djm@openbsd.org -Date: Fri Oct 18 05:37:24 2024 +0000 - - upstream: allow "-" as output file for moduli screening - - based on GHPR393 - - OpenBSD-Commit-ID: 1517763764eb55d03a6092dd120d2909c6fef0e1 - -commit 5eb5c4b2820d0636b1eccee646fb32ec946c4a95 -Author: djm@openbsd.org -Date: Fri Oct 18 05:32:51 2024 +0000 - - upstream: ssh-keyscan doesn't need it's own sshfatal() definition, it - - can use the shared one from fatal.c - - based on GHPR401 from lengyijun - - OpenBSD-Commit-ID: 8ea75ea99f27f464c9223cbc89cb046ccf9cd5c4 - -commit 0a1e75499e2c6fc258ee903645c878480949f362 -Author: djm@openbsd.org -Date: Fri Oct 18 05:14:51 2024 +0000 - - upstream: in _ssh_order_hostkeyalgs() consider ECDSA curve type when - - arranging the hostkey algorithms. AFAIK this code is unused in OpenSSH, but I - guess others are using it - - based on GHPR387 from Pawel Jakub Dawidek - - OpenBSD-Commit-ID: 4d462495ac0c40f7b7dd66178e0005b9b2128225 - -commit d01ee7a88c5f4b1aa8c75a7c739f8f3bc1ad8bde -Author: djm@openbsd.org -Date: Fri Oct 18 05:03:34 2024 +0000 - - upstream: require control-escape character sequences passed via the '-e - - ^x' commandline to be exactly two characters long. Avoids one by OOB read if - ssh is invoked as "ssh -e^ ..." - - Spotted by Maciej Domanski in GHPR368 - - OpenBSD-Commit-ID: baa72bc60898fc5639e6c62de7493a202c95823d - -commit 74ff6382f5743e09930e6cbd195dac65cd6062c9 -Author: djm@openbsd.org -Date: Fri Oct 18 04:30:09 2024 +0000 - - upstream: remove addr.[ch] functions that are unused and - - visbility-restrict ones that are unused outside the implementation itself; - based on GHPR#282 by tobias@ - - OpenBSD-Commit-ID: a0140f2418b4d46cfaa7b33febc0a0931f9b2744 - -commit a9d6d7d93c533fa729f08b405e786d912553f33e -Author: djm@openbsd.org -Date: Fri Oct 18 04:14:59 2024 +0000 - - upstream: unreachable POLLERR case; from ya0guang via GHPR485 - - OpenBSD-Commit-ID: b3c82655190532b01eb817e532742cfaa4687eff - -commit d76424bf279ff951383e21213eb3759ea4090674 -Author: djm@openbsd.org -Date: Fri Oct 18 04:11:54 2024 +0000 - - upstream: s/Sx/Cm/ for external references; from Domen Puncer - - Kugler via GHPR501 - - OpenBSD-Commit-ID: f864a34feb5d5ff17160cf7c42ad0f7744fe8a3f - -commit ca204b994e2981e7bf95627b3105408917105649 -Author: naddy@openbsd.org -Date: Mon Oct 14 23:53:34 2024 +0000 - - upstream: mention SshdAuthPath option; ok djm@ - - OpenBSD-Commit-ID: 9a5d3add25e4e77bd3805bc5583a842ecf34d85c - -commit be27770e840c4dd9d9fcad1aa879400c727d7c2f -Author: Darren Tucker -Date: Fri Oct 18 13:37:55 2024 +1100 - - Remove references to systrace and pledge sandboxes. - - ok djm@ - -commit 49e64bf63fbf2f14961062dafe8ef08cb816bb08 -Author: Pavel Miadzvedzeu -Date: Wed Apr 24 10:19:56 2024 +0300 - - Fix "undeclared 'ut'" error by replacing it with 'utx' - -commit 67f684733f60f66479854a2867b953de731e71b2 -Author: Darren Tucker -Date: Thu Oct 17 20:50:29 2024 +1100 - - Seed RNG when starting up sshd-auth. - - Makes builds configured --without-openssl work again since otherwise - the first use of the RNG comes after the sandbox init and it can't - open /dev/random. - -commit c06c681aeebbe8e84e7410095514e7ee91f7e6cb -Author: Darren Tucker -Date: Thu Oct 17 19:18:23 2024 +1100 - - MacOS 12 runners are deprecated, replace with 15. - -commit 39db1f23bafb48a7c0cc9c65c716a0370f4cc677 -Author: Damien Miller -Date: Thu Oct 17 13:28:47 2024 +1100 - - Fix lookup path for sshd-auth; bz3745 - -commit 541d3ba50af9cc396075be5e448a7d591479d06b -Author: Chris Rapier -Date: Wed Oct 16 15:56:48 2024 -0400 - - Documentation fixes in README.md and HPNSSHInstallation.txt - - Provided by oregonpillow @ github - -commit c537eeb1ae5f069450053b0027e64efe5bdb37d2 -Author: Damien Miller -Date: Wed Oct 16 08:28:21 2024 +1100 - - fix breakage; missing saved_argc symbol - -commit 98a0883bdef28a06c7e017f27adf21ba57898bf4 -Author: Damien Miller -Date: Mon Oct 14 17:17:50 2024 +1100 - - fix capsicum sandbox - -commit 164ea4380564a2a83713eacf71908e3946e5e4e4 -Author: Damien Miller -Date: Mon Oct 14 17:16:41 2024 +1100 - - put back some portable bits for sshd-auth.c - -commit f8edf08c258ee2918689872c4702302052729726 -Author: Damien Miller -Date: Mon Oct 14 14:49:25 2024 +1100 - - there's only one sandbox, move to a static global - -commit 4482f0042b41d3d63c3845d7ba9fcf47c9252a84 -Author: Damien Miller -Date: Mon Oct 14 14:49:20 2024 +1100 - - depend - -commit 74856204a353a187dc6e7706c6cf84b7f14d775d -Author: djm@openbsd.org -Date: Mon Oct 14 03:02:08 2024 +0000 - - upstream: regress support for split sshd-auth binary - - OpenBSD-Regress-ID: df7d18a87b475f70004770f0f4e404adba5f6ab7 - -commit 461741083d7254595fecea274e60fe3ebf3ce3f9 -Author: djm@openbsd.org -Date: Fri Sep 27 01:05:54 2024 +0000 - - upstream: test some more Match syntax, including criteria=arg and - - negations - - OpenBSD-Regress-ID: 67476baccc60bf1a255fd4e329ada950047b8b8d - -commit 6072e4c9385713e9c166f32cfca6a7e603d4f0b8 -Author: djm@openbsd.org -Date: Mon Oct 14 01:57:50 2024 +0000 - - upstream: Split per-connection sshd-session binary - - This splits the user authentication code from the sshd-session - binary into a separate sshd-auth binary. This will be executed by - sshd-session to complete the user authentication phase of the - protocol only. - - Splitting this code into a separate binary ensures that the crucial - pre-authentication attack surface has an entirely disjoint address - space from the code used for the rest of the connection. It also - yields a small runtime memory saving as the authentication code will - be unloaded after thhe authentication phase completes. - - Joint work with markus@ feedback deraadt@ - - Tested in snaps since last week - - OpenBSD-Commit-ID: 9c3b2087ae08626ec31b4177b023db600e986d9c - -commit fe6c6330c1a94c7a537efe9069853ce7a275c50a -Author: djm@openbsd.org -Date: Sun Oct 13 22:20:06 2024 +0000 - - upstream: don't start the ObscureKeystrokeTiming mitigations if - - there has been traffic on a X11 forwarding channel recently. - - Should fix X11 forwarding performance problems when this setting is - enabled. Patch from Antonio Larrosa via bz3655 - - OpenBSD-Commit-ID: 820284a92eb4592fcd3d181a62c1b86b08a4a7ab - -commit 538cd28598ae942c94b99855b06fdd937e2e7381 -Author: jsg@openbsd.org -Date: Sat Oct 12 10:50:37 2024 +0000 - - upstream: remove duplicate misc.h include ok dtucker@ - - OpenBSD-Commit-ID: fdd056e7854294834d54632b4282b877cfe4c12e - -commit 0051381a8c33740a77a1eca6859efa1c78887d80 -Author: djm@openbsd.org -Date: Sun Oct 6 23:37:17 2024 +0000 - - upstream: Turn off finite field (a.k.a modp) Diffie-Hellman key - - exchange in sshd by default. Specifically, this removes the - diffie-hellman-group* and diffie-hellman-group-exchange-* methods. The client - is unchanged and continues to support these methods by default. - - Finite field Diffie Hellman is slow and computationally expensive for - the same security level as Elliptic Curve DH or PQ key agreement while - offering no redeeming advantages. - - ECDH has been specified for the SSH protocol for 15 years and some - form of ECDH has been the default key exchange in OpenSSH for the last - 14 years. - - ok markus@ - - OpenBSD-Commit-ID: 4e238ad480a33312667cc10ae0eb6393abaec8da - -commit 347fb921d5ab64f24c962bb83f276cba5da422f4 -Merge: 1f72ea21d c7bc8d5ba -Author: Chris Rapier -Date: Wed Oct 2 11:29:04 2024 -0400 - - Merge pull request #106 from rapier1/dev_minor - - Merge OpenSSH 9.9 into HPN-SSH 18.6.0 - -commit c7bc8d5ba1e09d807839c039d487b2c72b1af961 -Author: Chris Rapier -Date: Mon Sep 30 14:25:37 2024 -0400 - - Copy/Paste error/typo in regress/rekey.sh - -commit ba9c2f19bc7c0b62b21dad1e8d97f2a704bbce7e -Author: Chris Rapier -Date: Mon Sep 30 14:19:07 2024 -0400 - - Updated method to skip none MAC regression test. - - It's easier and less error prone to just filter the - none MAC from the list of MACs to test. - -commit b0050bdd7b071ea6151b884adea98a208cb9d1f0 -Author: Chris Rapier -Date: Mon Sep 30 14:15:18 2024 -0400 - - Fix test of none MAC in rekey regression test. - - The none MAC is valid in HPN-SSH but it's not enabled by - default in sshd_config. So when the rekey tests tries to test - it then it will fail. This doesn't occur in all scenarious but - absolutely under OSX and other cases in which openssl is disabled. - -commit 7ba2f82a0ff04c84f52904b45eb3f3b99001714f -Author: Chris Rapier -Date: Fri Sep 27 15:36:06 2024 -0400 - - This fixes an issues that was preventing compilation on some big-endian architectures. - - A one line fix provided by Mattias Ellert. - See https://github.com/rapier1/hpn-ssh/pull/93 for the PR. - -commit 19bcb2d90c6caf14abf386b644fb24eb7afab889 -Author: djm@openbsd.org -Date: Thu Sep 26 23:55:08 2024 +0000 - - upstream: fix previous change to ssh_config Match, which broken on - - negated Matches; spotted by phessler@ ok deraadt@ - - OpenBSD-Commit-ID: b1c6acec66cd5bd1252feff1d02ad7129ced37c7 - -commit 67a115e7a56dbdc3f5a58c64b29231151f3670f5 -Author: djm@openbsd.org -Date: Thu Sep 26 23:55:08 2024 +0000 - - upstream: fix previous change to ssh_config Match, which broken on - - negated Matches; spotted by phessler@ ok deraadt@ - - OpenBSD-Commit-ID: b1c6acec66cd5bd1252feff1d02ad7129ced37c7 - -commit 220b6c1290042acd5180d783dea01efe1365c265 -Author: jsg@openbsd.org -Date: Wed Sep 25 23:01:39 2024 +0000 - - upstream: remove some unused defines; ok djm@ - - OpenBSD-Commit-ID: 3a63e4e11d455704f684c28715d61b17f91e0996 - -commit 3ef4f6e8a4d774f73852391fdccbb95f39fc71bf -Author: jmc@openbsd.org -Date: Wed Sep 25 06:13:01 2024 +0000 - - upstream: remove some unneeded Xo/Xc calls; from evan silberman the - - original diff had a couple of errors, which i've fixed - - OpenBSD-Commit-ID: f37ad5888adbc0d4e1cd6b6de237841f4b1e650d - -commit 66878e12a207fa9746dee3e2bdcca29b704cf035 -Author: djm@openbsd.org -Date: Wed Sep 25 01:24:04 2024 +0000 - - upstream: fix regression introduced when I switched the "Match" - - criteria tokeniser to a more shell-like one. Apparently the old tokeniser - (accidentally?) allowed "Match criteria=argument" as well as the "Match - criteria argument" syntax that we tested for. - - People were using this syntax so this adds back support for - "Match criteria=argument" - - bz3739 ok dtucker - - OpenBSD-Commit-ID: d1eebedb8c902002b75b75debfe1eeea1801f58a - -commit ff2cd1dd5711ff88efdf26662d6189d980439a1f -Author: Damien Miller -Date: Wed Sep 25 11:15:45 2024 +1000 - - gss-serv.c needs sys/param.h - - From Void Linux - -commit 2c12ae8cf9b0b7549ae097c4123abeda0ee63e5b -Author: Damien Miller -Date: Wed Sep 25 11:13:05 2024 +1000 - - build construct_utmp() when USE_BTMP is set - - Fixes compile error on Void Linux/Musl - -commit c7fda601186ff28128cfe3eab9c9c0622de096e1 -Author: Christoph Ostarek -Date: Wed Jul 3 12:46:59 2024 +0200 - - fix utmpx ifdef - - 02e16ad95fb1f56ab004b01a10aab89f7103c55d did a copy-paste for - utmpx, but forgot to change the ifdef appropriately - -commit 3f02368e8e9121847727c46b280efc280e5eb615 -Author: djm@openbsd.org -Date: Wed Sep 25 01:24:04 2024 +0000 - - upstream: fix regression introduced when I switched the "Match" - - criteria tokeniser to a more shell-like one. Apparently the old tokeniser - (accidentally?) allowed "Match criteria=argument" as well as the "Match - criteria argument" syntax that we tested for. - - People were using this syntax so this adds back support for - "Match criteria=argument" - - bz3739 ok dtucker - - OpenBSD-Commit-ID: d1eebedb8c902002b75b75debfe1eeea1801f58a - -commit 9517cc58577f85a0ba5f8bb46778dff625f0688f -Author: djm@openbsd.org -Date: Tue Sep 24 02:28:17 2024 +0000 - - upstream: some extra paranoia, reminded by jsg@ - - OpenBSD-Commit-ID: 22072bfa1df1391858ae7768a6c627e08593a91e - -commit 815a94e86a68c1000b8310cb47695cea9329516c -Author: Damien Miller -Date: Wed Sep 25 11:15:45 2024 +1000 - - gss-serv.c needs sys/param.h - - From Void Linux - -commit 76a618d2842c34c16cd21a4efc7230e2f459008d -Author: Damien Miller -Date: Wed Sep 25 11:13:05 2024 +1000 - - build construct_utmp() when USE_BTMP is set - - Fixes compile error on Void Linux/Musl - -commit d3aee17f6d395202eaa42a0c449b6da41f61527c -Author: Darren Tucker -Date: Tue Sep 24 18:41:44 2024 +1000 - - Test the flags from OpenWRT's package. - -commit 0f5d19e6fe4b58a89e6dc8c71a2aae30365d193e -Author: Christoph Ostarek -Date: Wed Jul 3 12:46:59 2024 +0200 - - fix utmpx ifdef - - 02e16ad95fb1f56ab004b01a10aab89f7103c55d did a copy-paste for - utmpx, but forgot to change the ifdef appropriately - -commit e03239f999acf9dc3da0f2f72bde36abbe678911 -Author: jsg@openbsd.org -Date: Sun Sep 22 12:56:21 2024 +0000 - - upstream: remove some unused defines; ok djm@ - - OpenBSD-Commit-ID: 81869ee6356fdbff19dae6ff757095e6b24de712 - -commit a35f543d3a6275fef781e515c262d1c687c3bc28 -Author: jsg@openbsd.org -Date: Fri Sep 20 02:00:46 2024 +0000 - - upstream: remove unneeded semicolons; checked by millert@ - - OpenBSD-Commit-ID: 3fb621a58e04b759a875ad6a33f35bb57ca80231 - -commit 7cf4dc414de689c467e58e49fb83f6609c3ed36b -Author: Darren Tucker -Date: Mon Sep 23 20:54:26 2024 +1000 - - Remove non-9.9 branch statuses. - -commit 8513f4d30ae85d17b3b08da6bc3be76f8c73123c -Author: Darren Tucker -Date: Mon Sep 23 20:52:31 2024 +1000 - - Add 9.9 branch to CI status console. - -commit 1641f2d4d6e05d2147913442864cae546e64f08b -Author: Darren Tucker -Date: Mon Sep 23 20:52:31 2024 +1000 - - Add 9.9 branch to CI status console. - -commit a0df478f6cea9ead230c6c40e4a2054d4dee41a5 -Author: Chris Rapier -Date: Fri Sep 20 17:45:15 2024 -0400 - - Crank vesrion number. - -commit f30380ca04b53d3a1d6c27e1b12564e645fab0ee -Merge: 1f72ea21d 53a80baae -Author: Chris Rapier -Date: Fri Sep 20 17:11:35 2024 -0400 - - First pass at porting 9.9 into 18.6.0 - - The only parts of the merge that conflicted were in the - document dates of some of the man pages and some CI - config files. This has not yet passed regression or - functionality tests. - -commit 53a80baaebda180f46e6e8571f3ff800e1f5c496 -Author: Damien Miller -Date: Fri Sep 20 08:20:48 2024 +1000 - - autogenerated files for release - -commit 46d1fb16b20e971b9ac15e86a3d3e350b49c9ad6 -Author: Damien Miller -Date: Fri Sep 20 08:20:13 2024 +1000 - - update version numbers - -commit 0bdca1f218971b38728a0a129f482476baff0968 -Author: djm@openbsd.org -Date: Thu Sep 19 22:17:44 2024 +0000 - - upstream: openssh-9.9 - - OpenBSD-Commit-ID: 303417285f1a73b9cb7a2ae78d3f493bbbe31f98 - -commit 1f72ea21da03cdbe94705908eda584171474c3a0 -Merge: cf9597fd7 87c8cd329 -Author: Chris Rapier -Date: Thu Sep 19 14:00:54 2024 -0400 - - Merge pull request #101 from rapier1/update_version_string - - Push the version string - -commit 87c8cd329c60b2aecd9906fdd865bb5f9e5adea1 -Author: Chris Rapier -Date: Thu Sep 19 13:59:07 2024 -0400 - - Push the version string - -commit cf9597fd7bdd0b874f2edfd3571c62f0e580c56c -Merge: 15b6f4118 e2381f6ba -Author: Chris Rapier -Date: Thu Sep 19 13:34:06 2024 -0400 - - Merge pull request #100 from rapier1/bug_pam_18.5.0_fix - - Fix issue with pam where it was looking for an sshd pam file instead hpnsshd - -commit e2381f6ba9c32908fb25463d893ec579a8a069fb -Author: Chris Rapier -Date: Thu Sep 19 13:15:10 2024 -0400 - - Fix issue with pam where it was looking for an sshd pam file instead of hpnsshd. - - Mitch found this. Seems to have been cause by a change in OpenSSH 9.8 where - they made the pam service configurable and made the default sshd. This will - work in most situations because OpenSSH is already installed but will fail - if the only installed ssh server is hpn-ssh. This fix simply changes the default - name from 'sshd' to 'hpnsshd'. - -commit ef2d7f2d3e1b4c9ae71bacf963e76a92ab8be543 -Author: Damien Miller -Date: Wed Sep 18 16:03:23 2024 +1000 - - include openbsd-compat/base64.c license in LICENSE - -commit 7ef362b989c8d1f7596f557f22e5924b9c08f0ea -Author: Damien Miller -Date: Wed Sep 18 09:01:23 2024 +1000 - - conditionally include mman.h in arc4random code - -commit 5fb2b5ad0e748732a27fd8cc16a7ca3c21770806 -Author: Damien Miller -Date: Tue Sep 17 11:53:24 2024 +1000 - - fix bug in recently-added sntrup761 fuzzer - - key values need to be static to persist across invocations; - spotted by the Qualys Security Advisory team. - -commit 0ca128c9ee894f1b0067abd473bfb33171df67f8 -Author: djm@openbsd.org -Date: Mon Sep 16 05:37:05 2024 +0000 - - upstream: use 64 bit math to avoid signed underflow. upstream code - - relies on using -fwrapv to provide defined over/underflow behaviour, but we - use -ftrapv to catch integer errors and abort the program. ok dtucker@ - - OpenBSD-Commit-ID: 8933369b33c17b5f02479503d0a92d87bc3a574b - -commit f82e5e22cad88c81d8a117de74241328c7b101c3 -Author: jmc@openbsd.org -Date: Sun Sep 15 08:27:38 2024 +0000 - - upstream: minor grammar/sort fixes for refuseconnection; ok djm - - OpenBSD-Commit-ID: 1c81f37b138b8b66abba811fec836388a0f3e6da - -commit 0c1165fc78e8fe69b5df71f81a8f944554a68b53 -Author: Damien Miller -Date: Sun Sep 15 13:30:13 2024 +1000 - - avoid gcc warning in fuzz test - -commit ce171d0718104b643854b53443ff72f7283d33f2 -Author: djm@openbsd.org -Date: Sun Sep 15 03:09:44 2024 +0000 - - upstream: bad whitespace in config dump output - - OpenBSD-Commit-ID: d899c13b0e8061d209298eaf58fe53e3643e967c - -commit 671c440786a5a66216922f15d0007b60f1e6733f -Author: Damien Miller -Date: Sun Sep 15 12:53:59 2024 +1000 - - use construct_utmp to construct btmp records - - Simpler and removes some code with the old-style BSD license. - -commit 930cb02b6113df72fbc732b9feb8e4f490952a81 -Author: djm@openbsd.org -Date: Sun Sep 15 02:20:51 2024 +0000 - - upstream: update the Streamlined NTRU Prime code from the "ref" - - implementation in SUPERCOP 20201130 to the "compact" implementation in - SUPERCOP 20240808. The new version is substantially faster. Thanks to Daniel - J Bernstein for pointing out the new implementation (and of course for - writing it). - - tested in snaps/ok deraadt@ - - OpenBSD-Commit-ID: bf1a77924c125ecdbf03e2f3df8ad13bd3dafdcb - -commit 9306d6017e0ce5dea6824c29ca5ba5673c2923ad -Author: djm@openbsd.org -Date: Sun Sep 15 01:19:56 2024 +0000 - - upstream: document Match invalid-user - - OpenBSD-Commit-ID: 2c84a9b517283e9711e2812c1f268081dcb02081 - -commit 0118a4da21147a88a56dc8b90bbc2849fefd5c1e -Author: djm@openbsd.org -Date: Sun Sep 15 01:18:26 2024 +0000 - - upstream: add a "Match invalid-user" predicate to sshd_config Match - - options. - - This allows writing Match conditions that trigger for invalid username. - E.g. - - PerSourcePenalties refuseconnection:90s - Match invalid-user - RefuseConnection yes - - Will effectively penalise bots try to guess passwords for bogus accounts, - at the cost of implicitly revealing which accounts are invalid. - - feedback markus@ - - OpenBSD-Commit-ID: 93d3a46ca04bbd9d84a94d1e1d9d3a21073fbb07 - -commit 7875975136f275619427604900cb0ffd7020e845 -Author: djm@openbsd.org -Date: Sun Sep 15 01:11:26 2024 +0000 - - upstream: Add a "refuseconnection" penalty class to sshd_config - - PerSourcePenalties - - This allows penalising connection sources that have had connections - dropped by the RefuseConnection option. ok markus@ - - OpenBSD-Commit-ID: 3c8443c427470bb3eac1880aa075cb4864463cb6 - -commit 8d21713b669b8516ca6d43424a356fccc37212bb -Author: djm@openbsd.org -Date: Sun Sep 15 01:09:40 2024 +0000 - - upstream: Add a sshd_config "RefuseConnection" option - - If set, this will terminate the connection at the first authentication - request (this is the earliest we can evaluate sshd_config Match blocks) - - ok markus@ - - OpenBSD-Commit-ID: 43cc2533984074c44d0d2f92eb93f661e7a0b09c - -commit acad117e66018fe1fa5caf41b36e6dfbd61f76a1 -Author: djm@openbsd.org -Date: Sun Sep 15 00:58:01 2024 +0000 - - upstream: switch sshd_config Match processing to the argv tokeniser - - too; ok markus@ - - OpenBSD-Commit-ID: b74b5b0385f2e0379670e2b869318a65b0bc3923 - -commit baec3f7f4c60cd5aa1bb9adbeb6dfa4a172502a8 -Author: djm@openbsd.org -Date: Sun Sep 15 00:57:36 2024 +0000 - - upstream: switch "Match" directive processing over to the argv - - string tokeniser, making it possible to use shell-like quoting in Match - directives, particularly "Match exec". ok markus@ - - OpenBSD-Commit-ID: 0877309650b76f624b2194c35dbacaf065e769a5 - -commit dd424d7c382c2074ab70f1b8ad4f169a10f60ee7 -Author: djm@openbsd.org -Date: Sun Sep 15 00:47:01 2024 +0000 - - upstream: include pathname in some of the ssh-keygen passphrase - - prompts. Helps the user know what's going on when ssh-keygen is invoked via - other tools. Requested in GHPR503 - - OpenBSD-Commit-ID: 613b0bb6cf845b7e787d69a5b314057ceda6a8b6 - -commit 62bbf8f825cc390ecb0523752ddac1435006f206 -Author: djm@openbsd.org -Date: Sun Sep 15 00:41:18 2024 +0000 - - upstream: Do not apply authorized_keys options when signature - - verification fails. Prevents restrictive key options being incorrectly - applied to subsequent keys in authorized_keys. bz3733, ok markus@ - - OpenBSD-Commit-ID: ba3776d9da4642443c19dbc015a1333622eb5a4e - -commit 15b6f411881b7bb0bc5139418eae46796a4f0a97 -Merge: 52bc5fd19 4585f916c -Author: Chris Rapier -Date: Fri Sep 13 13:57:08 2024 -0400 - - Release of HPN-18.5.0 incorporating OpenSSH 9.8p1 - - This release brings HPN-SSH up to OpenSSH 9.8 which brings - along all of the changes in OpenSSH. This includes changes - to the hpnsshd server; specifically splitting the server into - relative barebones listener and a hpnsshd-session client that - handles the user interaction on the server side. - - There are limited changes to HPN-SSH itself aside from a minor - change to the versioning to make it RFC compliant. Thanks to - Lupo Luchini for pointing this out. - -commit 49f325fd47af4e53fcd7aafdbcc280e53f5aa5ce -Author: Wu Weixin -Date: Fri Aug 2 22:16:40 2024 +0800 - - Fix without_openssl always being set to 1 - - In Fedora systems, %{?rhel} is empty. In RHEL systems, %{?fedora} is - empty. Therefore, the original code always sets without_openssl to 1. - -commit c21c3a2419bbc1c59cb1a16ea356e703e99a90d9 -Author: djm@openbsd.org -Date: Thu Sep 12 00:36:27 2024 +0000 - - upstream: Relax absolute path requirement back to what it was prior to - - OpenSSH 9.8, which incorrectly required that sshd was started with an - absolute path in inetd mode. bz3717, patch from Colin Wilson - - OpenBSD-Commit-ID: 25c57f22764897242d942853f8cccc5e991ea058 - -commit 1bc426f51b0a5cfdcfbd205218f0b6839ffe91e9 -Author: naddy@openbsd.org -Date: Mon Sep 9 14:41:21 2024 +0000 - - upstream: document the mlkem768x25519-sha256 key exchange algorithm - - OpenBSD-Commit-ID: fa18dccdd9753dd287e62ecab189b3de45672521 - -commit 0a2db61a5ffc64d2e2961c52964f933879952fc7 -Author: Darren Tucker -Date: Tue Sep 10 21:11:14 2024 +1000 - - Spell omnios test host correctly. - -commit 059ed698a47c9af541a49cf754fd09f984ac5a21 -Author: Darren Tucker -Date: Tue Sep 10 18:52:02 2024 +1000 - - Add omnios test target. - -commit f4ff91575a448b19176ceaa8fd6843a25f39d572 -Author: Darren Tucker -Date: Tue Sep 10 18:45:55 2024 +1000 - - Wrap stdint.h in ifdef. - -commit ff714f001d20a9c843ee1fd9d92a16d40567d264 -Author: Darren Tucker -Date: Mon Sep 9 19:31:54 2024 +1000 - - Also test PAM on dfly64. - -commit 509b757c052ea969b3a41fc36818b44801caf1cf -Author: Damien Miller -Date: Mon Sep 9 21:50:14 2024 +1000 - - stubs for ML-KEM KEX functions - - used for C89 compilers - -commit 273581210c99ce7275b8efdefbb9f89e1c22e341 -Author: Damien Miller -Date: Mon Sep 9 17:30:38 2024 +1000 - - declare defeat trying to detect C89 compilers - - I can't find a reliable way to detect the features the ML-KEM code - requires in configure. Give up for now and use VLA support (that we - can detect) as a proxy for "old compiler" and turn off ML-KEM if - it isn't supported. - -commit e8a0f19b56dfa20f98ea9876d7171ec315fb338a -Author: Damien Miller -Date: Mon Sep 9 16:46:40 2024 +1000 - - fix previous; check for C99 compound literals - - The previous commit was incorrect (or at least insufficient), the - ML-KEM code is actually using compound literals, so test for them. - -commit 7c07bec1446978bebe0780ed822c8fedfb377ae8 -Author: Damien Miller -Date: Mon Sep 9 16:06:21 2024 +1000 - - test for compiler feature needed for ML-KEM - - The ML-KEM implementation we uses need the compiler to support - C99-style named struct initialisers (e.g foo = {.bar = 1}). We - still support (barely) building OpenSSH with older compilers, so - add a configure test for this. - -commit d469d5f348772058789d35332d1ccb0b109c28ef -Author: djm@openbsd.org -Date: Mon Sep 9 03:13:39 2024 +0000 - - upstream: test mlkem768x25519-sha256 - - OpenBSD-Regress-ID: 7baf6bc39ae55648db1a2bfdc55a624954847611 - -commit 62fb2b51bb7f6863c3ab697f397b2068da1c993f -Author: djm@openbsd.org -Date: Mon Sep 9 02:39:57 2024 +0000 - - upstream: pull post-quantum ML-KEM/x25519 key exchange out from - - compile-time flag now than an IANA codepoint has been assigned for the - algorithm. - - Add mlkem768x25519-sha256 in 2nd KexAlgorithms preference slot. - - ok markus@ - - OpenBSD-Commit-ID: 9f50a0fae7d7ae8b27fcca11f8dc6f979207451a - -commit a8ad7a2952111c6ce32949a775df94286550af6b -Author: djm@openbsd.org -Date: Fri Sep 6 02:30:44 2024 +0000 - - upstream: make parsing user@host consistently look for the last '@' in - - the string rather than the first. This makes it possible to use usernames - that contain '@' characters. - MIME-Version: 1.0 - Content-Type: text/plain; charset=UTF-8 - Content-Transfer-Encoding: 8bit - - Prompted by Max Zettlmeißl; feedback/ok millert@ - - OpenBSD-Commit-ID: 0b16eec246cda15469ebdcf3b1e2479810e394c5 - -commit 4585f916c56f995b3f8bd5c46f32d017dd7cc18b -Author: Chris Rapier -Date: Thu Sep 5 11:24:48 2024 -0400 - - Changed hyphen in version string to underscore. - - According to RFC 4253 the version string cannot include - a hyphen or minus sign in the protoversion or softwareversion - stanzas. So while you can use a hyphen between those stanzas - you cannot include a hypen in the stanza. Since the hpn version - is part of the softwareversion stanza we can't include a hypen. - Chnaging it to an underscore is acceptable and won't break - our compatability tests in compat.c - See RFC 4253 Section 4.2. - - brought to our attention by Lapo Luchini via github - issue #97 - -commit 13cc78d016b67a74a67f1c97c7c348084cd9212c -Author: djm@openbsd.org -Date: Wed Sep 4 05:33:34 2024 +0000 - - upstream: be more strict in parsing key type names. Only allow - - shortnames (e.g "rsa") in user-interface code and require full SSH protocol - names (e.g. "ssh-rsa") everywhere else. - - Prompted by bz3725; ok markus@ - - OpenBSD-Commit-ID: b3d8de9dac37992eab78adbf84fab2fe0d84b187 - -commit ef8472309a68e319018def6f8ea47aeb40d806f5 -Author: djm@openbsd.org -Date: Wed Sep 4 05:11:33 2024 +0000 - - upstream: fix RCSID in output - - OpenBSD-Commit-ID: 889ae07f2d2193ddc4351711919134664951dd76 - -commit ba2ef20c75c5268d4d1257adfc2ac11c930d31e1 -Author: jmc@openbsd.org -Date: Tue Sep 3 06:17:48 2024 +0000 - - upstream: envrionment -> environment; - - OpenBSD-Commit-ID: b719f39c20e8c671ec6135c832d6cc67a595af9c - -commit e66c0c5673a4304a3a9fbf8305c6a19f8653740f -Author: Damien Miller -Date: Wed Sep 4 15:35:29 2024 +1000 - - add basic fuzzers for our import of sntrup761 - -commit d19dea6330ecd4eb403fef2423bd7e127f4c9828 -Author: djm@openbsd.org -Date: Tue Sep 3 05:58:56 2024 +0000 - - upstream: regression test for Include variable expansion - - OpenBSD-Regress-ID: 35477da3ba1abd9ca64bc49080c50a9c1350c6ca - -commit 8c4d6a628051e318bae2f283e8dc38b896400862 -Author: djm@openbsd.org -Date: Tue Sep 3 05:29:55 2024 +0000 - - upstream: allow the "Include" directive to expand the same set of - - %-tokens that "Match Exec" and environment variables. - - ok dtucker@ - - OpenBSD-Commit-ID: 12ef521eaa966a9241e684258564f52f1f3c5d37 - -commit 51b82648b6827675fc0cde21175fd1ed8e89aab2 -Author: djm@openbsd.org -Date: Mon Sep 2 12:18:35 2024 +0000 - - upstream: missing ifdef - - OpenBSD-Commit-ID: 85f09da957dd39fd0abe08fe5ee19393f25c2021 - -commit f68312eb593943127b39ba79a4d7fa438c34c153 -Author: djm@openbsd.org -Date: Mon Sep 2 12:13:56 2024 +0000 - - upstream: Add experimental support for hybrid post-quantum key exchange - - ML-KEM768 with ECDH/X25519 from the Internet-draft: - https://datatracker.ietf.org/doc/html/draft-kampanakis-curdle-ssh-pq-ke-03 - - This is based on previous patches from markus@ but adapted to use the - final FIPS203 standard ML-KEM using a formally-verified implementation - from libcrux. - - Note this key exchange method is still a draft and thus subject to - change. It is therefore disabled by default; set MLKEM=yes to build it. - We're making it available now to make it easy for other SSH - implementations to test against it. - - ok markus@ deraadt@ - - OpenBSD-Commit-ID: 02a8730a570b63fa8acd9913ec66353735dea42c - -commit 05f2b141cfcc60c7cdedf9450d2b9d390c19eaad -Author: Antonio Larrosa -Date: Fri Aug 23 12:21:06 2024 +0200 - - Don't skip audit before exitting cleanup_exit - - This fixes an issue where the SSH_CONNECTION_ABANDON event is not - audited because cleanup_exit overrides the regular _exit too soon and - as a result, failed auth attempts are not logged correctly. - - The problem was introduced in 81c1099d22b81ebfd20a334ce986c4f753b0db29 - where the code from upstream was merged before the audit_event call when - it should have been merged right before the _exit call in order to honor - the comment that just mentions an override of the exit value. - -commit 16eaf9d401e70996f89f3f417738a8db421aa959 -Author: djm@openbsd.org -Date: Wed Aug 28 12:08:26 2024 +0000 - - upstream: fix test: -F is the argument to specify a non-default - - ssh_config, not -f (this is sadly not a new bug) - - OpenBSD-Regress-ID: 45a7bda4cf33f2cea218507d8b6a55cddbcfb322 - -commit 10ccf611ab8ecba9ce6b0548c5ccd8c1220baf92 -Author: deraadt@openbsd.org -Date: Fri Aug 23 04:51:00 2024 +0000 - - upstream: As defined in the RFC, the SSH protocol has negotiable - - compression support (which is requested as the name "zlib"). Compression - starts very early in the session. Relative early in OpenSSH lifetime, privsep - was added to sshd, and this required a shared-memory hack so the two - processes could see what was going on in the dataflow. This shared-memory - hack was soon recognized as a tremendous complexity risk, because it put libz - (which very much trusts it's memory) in a dangerous place, and a new option - ("zlib@openssh.com") was added begins compression after authentication (aka - delayed-compression). That change also permitted removal of the - shared-memory hack. Despite removal from the server, the old "zlib" support - remained in the client, to allow negotiation with non-OpenSSH daemons which - lack the delayed-compression option. This commit deletes support for the - older "zlib" option in the client. It reduces our featureset in a small way, - and encourages other servers to move to a better design. The SSH protocol is - different enough that compressed-key-material attacks like BEAST are - unlikely, but who wants to take the chance? We encourage other ssh servers - who care about optional compression support to add delayed-zlib support. - (Some already do "zlib@openssh.com") ok djm markus - - OpenBSD-Commit-ID: 6df986f38e4ab389f795a6e39e7c6857a763ba72 - -commit aee54878255d71bf93aa6e91bbd4eb1825c0d1b9 -Author: djm@openbsd.org -Date: Thu Aug 22 23:11:30 2024 +0000 - - upstream: sntrup761x25519-sha512 now has an IANA codepoint assigned, so - - we can make the algorithm available without the @openssh.com suffix too. ok - markus@ deraadt@ - - OpenBSD-Commit-ID: eeed8fcde688143a737729d3d56d20ab4353770f - -commit a76a6b85108e3032c8175611ecc5746e7131f876 -Author: Darren Tucker -Date: Thu Aug 22 20:36:12 2024 +1000 - - Move rekey test into valgrind-2. - - Now that the rekey test has been optimized it's fast enough to not be in - its own valgrind test, so move it into valgrind-2, which is currently - the quickest of the others, bringing all of them to roughly the same - runtime of ~1.1 hours. - -commit 7e75e3f57c41b9a6e6401e7674d7c2ff5c33975b -Author: dtucker@openbsd.org -Date: Thu Aug 22 10:21:02 2024 +0000 - - upstream: Use aes128-ctr for MAC tests since default has implicit MAC. - - Also verify that the Cipher or MAC we intended to use is actually the one - selected during the test. - - OpenBSD-Regress-ID: ff43fed30552afe23d1364526fe8cf88cbfafe1d - -commit ebc890b8b4ba08c84cd1066b7b94b2b11f6c4cb4 -Author: Damien Miller -Date: Thu Aug 22 09:45:49 2024 +1000 - - fix incorrect default for PasswordAuthentication - - merge botch spotted by gsgleason - -commit 15ace435ea1c2fab2a1cc7d9c3157fe20c776b80 -Author: dtucker@openbsd.org -Date: Wed Aug 21 10:33:27 2024 +0000 - - upstream: Some awks won't match on the \r so delete it instead. Fixes - - regress in portable on, eg Solaris. - - OpenBSD-Regress-ID: 44a96d6d2f8341d89b7d5fff777502b92ac9e9ba - -commit 51c96b6ed627779a04493a8fe25747996a37f3c2 -Author: dtucker@openbsd.org -Date: Wed Aug 21 07:06:27 2024 +0000 - - upstream: Import regenerated moduli. - - OpenBSD-Commit-ID: 5db7049ad5558dee5b2079d3422e8ddab187c1cc - -commit 25c52f37a82c4da48ec537de37d7c168982b8d6d -Author: dtucker@openbsd.org -Date: Wed Aug 21 06:59:08 2024 +0000 - - upstream: Use curve25519-sha256 kex where possible. - - Except where we're explicitly testing a different kex, use - curve25519-sha256 since it's faster than the default and supported even - when configured without OpenSSL. Add a check to ensure that the kex we - intended to test is the one we actually tested. Speeds test up by ~5%. - - OpenBSD-Regress-ID: 3b27fcc2ae953cb08fd82a0d3155c498b226d6e0 - -commit 3eb62b7ba49483c309b483eb9002a679014f3887 -Author: dtucker@openbsd.org -Date: Tue Aug 20 12:36:59 2024 +0000 - - upstream: Send only as much data as needed to trigger rekeying. Speeds - - up tests by about 10% in the common case, hopefully more when instrumented - with something like valgrind. - - OpenBSD-Regress-ID: 7bf9292b4803357efcf0baf7cfbdc8521f212da1 - -commit cbd3f034bbf7853618fac99d7d868a2250154ea7 -Author: Damien Miller -Date: Wed Aug 21 09:18:29 2024 +1000 - - simplify sshkey_prekey_alloc(); always use mmap - -commit 4442bbc2fc661277a6dabfedb756a7e15ee8b8b8 -Author: dtucker@openbsd.org -Date: Tue Aug 20 09:15:49 2024 +0000 - - upstream: Merge AEAD test into main test loop. - - Removes 3 duplicate tests and speeds overall test up by about 1%. - - OpenBSD-Regress-ID: 5e5c9ff3f7588091ed369e34ac28520490ad2619 - -commit 829976a63fd1efae3a4c3e7c16fded59d92edb67 -Author: dtucker@openbsd.org -Date: Tue Aug 20 09:02:45 2024 +0000 - - upstream: Set a default RekeyLimit of 256k. - - Used unless overridden by a command-line flag, which simplifies some of - the ssh command lines. - - OpenBSD-Regress-ID: e7cffa57027088e10336e412b34113969f88cb87 - -commit 57d02c9ea36aebad4e7146d46e041b6b2e582f7f -Author: dtucker@openbsd.org -Date: Tue Aug 20 07:52:43 2024 +0000 - - upstream: Add Compression=no to default ssh_config. - - All of the rekey tests use it (otherwise the encrypted byte counts would - not match) so this lets us simplify the command lines. - - OpenBSD-Regress-ID: dab7ce10f4cf6c68827eb8658141272aab3ea262 - -commit 7254eb26f7c0772c4b47c3b32f6d1b15855cdd8c -Author: dtucker@openbsd.org -Date: Tue Aug 20 07:41:35 2024 +0000 - - upstream: Remove duplicate curve25519-sha256 kex. - - curve25519-sha256@libssh.org is the pre-standardization name for the same - thing, so remove it as a duplicate. Speeds up test by a tiny amount. - - OpenBSD-Regress-ID: 5a5ee5fa1595a6e140b1cc16040bedf5996a5715 - -commit 749896b874928c2785256cae4d75161dc3bfcc7d -Author: dtucker@openbsd.org -Date: Tue Aug 20 07:27:25 2024 +0000 - - upstream: Unnest rekey param parsing test and use ssh not sshd. - - ssh uses the same parsing code, now has "-G" to dump its config and is - slightly faster to start up. This speeds up the test slightly (~5%) in the - common case but should help more during instrumented tests, eg under - valgrind, where startup costs are magnified. - - OpenBSD-Regress-ID: 07c3acaf4c728e641033071f4441afc88141b0d0 - -commit 2b1762115481ff2b7a60fd4db2ae69b725437462 -Author: djm@openbsd.org -Date: Tue Aug 20 11:10:04 2024 +0000 - - upstream: actually use the length parameter that was passed in rather - - than a constant (this makes no difference in practice because the length is - always the same); reported by martin AT nmkd.net - - OpenBSD-Commit-ID: 4aecce232c2fe9b16e9217ff6bcb3c848d853e7e - -commit d922762ca16a7381131b242f49d7376c41fabcb5 -Author: Damien Miller -Date: Tue Aug 20 13:55:30 2024 +1000 - - private key coredump protection for Linux/FreeBSD - - platforms not supporting coredump exclusion using mmap/madvise flags - fall back to plain old malloc(3). - -commit cc048ca536d6bed6f2285b07040b0d57cd559ba5 -Author: djm@openbsd.org -Date: Tue Aug 20 03:48:30 2024 +0000 - - upstream: place shielded keys (i.e. keys at rest in RAM) into memory - - allocated using mmap(3) with MAP_CONCEAL set. This prevents exposure of the - key material in coredumps, etc (this is in addition to other measures we take - in this area). - - ok deraadt@ - - OpenBSD-Commit-ID: cbbae59f337a00c9858d6358bc65f74e62261369 - -commit a0b35c791cad1f85481b23ba46373060292e1c80 -Author: djm@openbsd.org -Date: Sat Aug 17 08:35:04 2024 +0000 - - upstream: mention that ed25519 is the default key type generated and - - clarify that rsa-sha2-512 is the default signature scheme when RSA is in use. - Based on GHPR505 from SebastianRzk - - OpenBSD-Commit-ID: 1d90df71636a04601685d2a10a8233bcc8d4f4c5 - -commit 127a50f2c80572ed1a021feb11ecf941e92cbbef -Author: djm@openbsd.org -Date: Sat Aug 17 08:23:04 2024 +0000 - - upstream: fix minor memory leak in Subsystem option parsing; from - - Antonio Larrosa via GHPR515 - - OpenBSD-Commit-ID: fff3bbefd1b2c45c98cbe45c6b857b15d8a2d364 - -commit 171427261d2079941eb1041079dbae875da37cbc -Author: djm@openbsd.org -Date: Sat Aug 17 08:09:50 2024 +0000 - - upstream: fix swapping of source and destination addresses in some sshd - - log messages - - OpenBSD-Commit-ID: 24d4cbb86325275df1f037545aa3b91456e52d25 - -commit 2a50a8f1fa57857a5e124a2280bcf61cc63c77f7 -Author: Darren Tucker -Date: Sat Aug 17 11:10:19 2024 +1000 - - Add compat functions for EVP_Digest{Sign,Verify}. - - This should make LibreSSL 3.1.x through 3.3.x work again. Code from - tb@, ok djm@. Restore the test configs covering those. - -commit 1c3a7145260e03037cc18715b883880836fd122d -Author: Philip Hands -Date: Thu Aug 8 13:03:51 2024 +0200 - - make sure that usage & man page match - - SSH-Copy-ID-Upstream: da5b1abe55b72a16e0430e7598e1573da01779c0 - -commit cd0d681645b9adcf2467e7838bfd9d5142de4c4e -Author: Philip Hands -Date: Thu Aug 8 13:01:47 2024 +0200 - - update copyright notices - - Bump the year to 2024, but also reflect the fact that hands.com Ltd. has - been wound up in the UK, and its assets (including this copyright) have - now reverted to its owner, Philip Hands. - - SSH-Copy-ID-Upstream: 0e4c4d072747a6568b11a790c29dd1b4ce663d7f - -commit 7fc9ccdce18841ebd0a97e31e43258512ab32a32 -Author: Philip Hands -Date: Sun Aug 4 20:45:00 2024 +0200 - - restore optionality of -i's argument - - SSH-Copy-ID-Upstream: f70e3abb510e4eeb040b47894e41828246c1b720 - -commit c37aa7012b1a3c2c322fd19e71310aadc90fc674 -Author: Philip Hands -Date: Fri Aug 2 15:52:07 2024 +0200 - - avoid exploring .ssh/id*.pub subdirectories - - SSH-Copy-ID-Upstream: 0b9e08b7707ad16de3c8e6a0410d9f42fbd56997 - -commit 777dce9e2e0d12f7e81e162f77749f30899869fe -Author: Philip Hands -Date: Fri Aug 2 10:07:11 2024 +0200 - - ensure that we're always told the source of keys - - SSH-Copy-ID-Upstream: 1bee96f4793e8ec3fab9f9361204ae58f5cc7cae - -commit fb94fd2339848e40cad6c9bb42b822244cc1a7bc -Author: Philip Hands -Date: Wed Jul 31 23:19:51 2024 +0200 - - add $HOME to ERROR if one cannot write to ~/.ssh - - SSH-Copy-ID-Upstream: ebef3e9c06e0447bff06e9d84b33023cf592e0ba - -commit eb5aafa1ffaeee75799141ec5ded406a65ec7d18 -Author: Philip Hands -Date: Wed Jul 31 23:19:03 2024 +0200 - - assert that SCRATCH_DIR is a writable directory - - SSH-Copy-ID-Upstream: ecb2b9d10883b9a16df56c83896c9bb47a80cde2 - -commit abcc460a2af46f0d812f8433d97a8eae1d80724c -Author: Philip Hands -Date: Wed Jul 31 23:17:54 2024 +0200 - - quote to avoid potential for word splitting - - SSH-Copy-ID-Upstream: f379adbe06ac2ef1daf0f130752234c7f8b97e3c - -commit b3f91411fd1473605f74c40c1a91a024c7171e27 -Author: Philip Hands -Date: Wed Jul 31 23:15:11 2024 +0200 - - ensure ERROR output goes to STDERR - - SSH-Copy-ID-Upstream: ac394b05eead3b91feb7c2ae4129a3e9b892f1e2 - -commit 674b8f30f0dbacd787eb1e4e7e1ece34b5543d8f -Author: Philip Hands -Date: Thu Aug 1 14:03:06 2024 +0200 - - avoid extra space when no arg given to -i option - - SSH-Copy-ID-Upstream: feca9e67e6e37c5653445d1c733569d7abb1770e - -commit 0efa0e1c41427c0c6ba839a18c72c1afcd7b7cc0 -Author: Philip Hands -Date: Wed Jul 31 23:28:36 2024 +0200 - - put the -i before -[pP] (matching man pages) - - The man pages (ssh, sftp & ssh-copy-id) all list -i before the port - setting, so make the output match that order, which also seems more - natural with the port being next to the server. - - SSH-Copy-ID-Upstream: 34d5d614172c78f9a42249466c4b81975b8883a1 - -commit 87831345e9745f2d13bd7a4a7972809f6788f331 -Author: Shreyas Mahangade -Date: Mon Jul 29 15:26:05 2024 +0000 - - Minor space issue fixed - - SSH-Copy-ID-Upstream: 335e44d7be78b03962a54c3a5c99a2ff45294a54 - -commit 2f3010f4736b4b3f5c10a4be97a24e90ff04c5e7 -Author: Shreyas Mahangade -Date: Mon Jul 29 16:55:28 2024 +0530 - - Show identity file in 'ssh' command - - - Previously no identity file is shown in "ssh" command output on the line "Now try logging into the..." - - This commit makes sure whenever "ssh-copy-id" with "-i" is invoked, it also reflects in "ssh" command - - SSH-Copy-ID-Upstream: 58e022ec26cb2315eb3be581d01e0ba787082428 - -commit a13856374b894397a7682b32257ed0bf67cfede9 -Author: Damien Miller -Date: Fri Aug 16 08:30:20 2024 +1000 - - more OPENSSL_HAS_ECC - -commit 4da2a1a7f648979bea6eaf3b17f5f250faed4afc -Author: Damien Miller -Date: Thu Aug 15 23:35:54 2024 +1000 - - fix merge botch that broke !OPENSSL_HAS_ECC - -commit 2c53d2f32b8e3992b61682c909ae5bc5122b6e5d -Author: Damien Miller -Date: Thu Aug 15 15:09:45 2024 +1000 - - missed OPENSSL_HAS_ECC case - -commit 342dd7a219f39119b8b686b5aaa99c8e15ede368 -Author: Damien Miller -Date: Thu Aug 15 15:06:55 2024 +1000 - - retire testing aginst older LibreSSL versions - - libressl prior to 3.4.x lack support for the EVP_DigestSign and - EVP_DigestVerify APIs that we need now that sshkey is converted - to EVP_PKEY. - - If someone makes a good case for why we should support these versions - then we could bring back support with wrappers. - -commit a7c6ea8eebe0f179141ec5dbf0c9e5354417930f -Author: Damien Miller -Date: Thu Aug 15 12:44:17 2024 +1000 - - sync TEST_MALLOC_OPTIONS for OpenBSD - -commit 60c2cf22e8f64f35d8b1175e4671257313f2e4d3 -Author: Damien Miller -Date: Thu Aug 15 12:43:47 2024 +1000 - - remove gratuitious difference from OpenBSD - -commit 339c4fc60a6250429d41fa8713f783d82aad4551 -Author: djm@openbsd.org -Date: Thu Aug 15 00:52:23 2024 +0000 - - upstream: adapt to EVP_PKEY conversion - - OpenBSD-Regress-ID: 0e2d4efb0ed0e392e23cd8fda183fe56531ac446 - -commit 63a94f99b9d7c8a48182a40192e45879d1ba8791 -Author: djm@openbsd.org -Date: Fri Jul 19 04:33:36 2024 +0000 - - upstream: test transfers in mux proxy mode too - - OpenBSD-Regress-ID: 2edfc980628cfef3550649cab8d69fa23b5cd6c4 - -commit 7bdfc20516e288b58c8c847958059c7b141eeff9 -Author: djm@openbsd.org -Date: Thu Aug 15 00:51:51 2024 +0000 - - upstream: Convert RSA and ECDSA key to the libcrypto EVP_PKEY API. - - DSA remains unconverted as it will be removed within six months. - - Based on patches originally from Dmitry Belyavskiy, but significantly - reworked based on feedback from Bob Beck, Joel Sing and especially - Theo Buehler (apologies to anyone I've missed). - - ok tb@ - - OpenBSD-Commit-ID: d098744e89f1dc7e5952a6817bef234eced648b5 - -commit 0af06e2c5b898992a18c74333e75a0136506acc6 -Author: tobias@openbsd.org -Date: Wed Aug 14 15:42:18 2024 +0000 - - upstream: Reorder calloc arguments - - The first argument should be the amount, the second argument should be the - element size. Fixing this also silences some gcc compiler warnings for - portable. - - Spotted with Benny Baumann (BenBE at geshi dot org). - - ok djm@ - - OpenBSD-Commit-ID: 711ad6f7bd7fb48bf52208f2cf9f108cddb6d41a - -commit 56ce0aa3c6cf28d9fcbce3207457abeac91b5050 -Author: tobias@openbsd.org -Date: Wed Aug 14 15:40:30 2024 +0000 - - upstream: Extend sshbuf validation - - Multiple sshbuf structs can be linked through a parent/child relationship. - Make sure that a single sshbuf cannot be its own parent. If this would ever - happen, it would result in reference counting issues. - - This is a cheap way of testing this with very little overhead. It does not - detect A->B->A linkages though for performance reason and the fact that it - takes a programming error for this to occur anyway. - - Authored with Benny Baumann (BenBE at geshi dot org). - - ok djm@ - - OpenBSD-Commit-ID: fb3fa9ee2cad3c7e842ebadfd7f5db220c4aaf16 - -commit fc48ddf6998188517af42dce807e2088b6a0c0be -Author: tobias@openbsd.org -Date: Wed Aug 14 15:37:11 2024 +0000 - - upstream: Use freezero for better readability - - It has the same meaning as the current pair of calling explicit_bzero - and free. Spotted with Benny Baumann (BenBE at geshi dot org). - - ok djm@ - - OpenBSD-Commit-ID: 939fbe9ccf52d0d48c5fa53694d6f3bb9927970c - -commit 1ff6907ec26dac6ac59fe9fe232899a63b4c14d8 -Author: tobias@openbsd.org -Date: Wed Aug 14 15:35:23 2024 +0000 - - upstream: Fix typo in comment - - Spotted with Benny Baumann (BenBE at geshi dot org). - - ok djm@ - - OpenBSD-Commit-ID: 829160ac8ef3ad3409695ce3a3ade835061cae57 - -commit 487faaed8f3bb9ffb19e8f807a3da72895b16421 -Author: dlg@openbsd.org -Date: Wed Jul 31 12:00:18 2024 +0000 - - upstream: add a random amount of time (up to 4 seconds) to the - - grace login time. - - ok deraadt@ djm@ - - OpenBSD-Commit-ID: abd3c57aaa5861517529b322df79b6be35ee67f4 - -commit 2865f5b7520bed3e74fbbb5f8d7a44193d7a4314 -Author: naddy@openbsd.org -Date: Fri Jul 26 15:24:49 2024 +0000 - - upstream: document the reduced logingrace penalty - - OpenBSD-Commit-ID: 9b63e0e3599d524ddc10edc4f978081382c3548b - -commit c171bdca46f82775119d65a53c2bde47113bad1e -Author: Chris Rapier -Date: Fri Aug 9 17:35:26 2024 -0400 - - Cygwin Issues. - - There have been issues with cygwin/windows CI tests. I think I - have identified the problem as missing steps in the workflow file. - This also incorporates a minor change in the dependencies for cygwin. - That was taken from openssh master. - -commit 9150b5475711b93ac100f9d3c96a2c92cae669b2 -Merge: ad1e0186c 6e97c21ce -Author: Chris Rapier -Date: Fri Aug 9 16:04:16 2024 -0400 - - Forward port 9.8 to HPN-SSH 18.5.0 - - This is the first pass of the 9.8 port that will be subject to the - github ci tests. It is passing local regression tests. - -commit 1ec0a64c5dc57b8a2053a93b5ef0d02ff8598e5c -Author: Darren Tucker -Date: Sun Jul 28 21:26:51 2024 +1000 - - Explicitly install libssl-devel cygwin. - - Should fix CI tests for cygwin default config. - -commit 0bf6e5bb750b66b25c20a1c5a471f91850de3748 -Author: djm@openbsd.org -Date: Thu Jul 25 23:44:01 2024 +0000 - - upstream: reduce logingrace penalty. - - A single forgotton login that times out should be below the penalty - threshold. - - ok deraadt/claudio - - OpenBSD-Commit-ID: cee1f7d17597c97bff8e5092af5d136fdb08f81d - -commit 29fb6f6d46b67770084b4f12bcf8a01bd535041b -Author: djm@openbsd.org -Date: Thu Jul 25 22:40:08 2024 +0000 - - upstream: Fix proxy multiplexing (-O proxy) bug - - If a mux started with ControlPersist then later has a forwarding added using - mux proxy connection and the forwarding was used, then when the mux proxy - session terminates, the mux master process will send a channel close to the - server with a bad channel ID and crash the connection. - - This was caused by my stupidly reusing c->remote_id for mux channel - associations when I should have just added another member to struct channel. - - ok markus@ - - OpenBSD-Commit-ID: c9f474e0124e3fe456c5e43749b97d75e65b82b2 - -commit 53d1d307438517805989c7d5616d752739a97e03 -Author: djm@openbsd.org -Date: Thu Jul 18 01:47:27 2024 +0000 - - upstream: mention mux proxy mode - - OpenBSD-Commit-ID: fd77a77779f06d316a314e4540dc57c93fc3369a - -commit a9b90859d252c2f5a24142f985d38610ac74685f -Author: jsg@openbsd.org -Date: Sun Jul 14 10:19:23 2024 +0000 - - upstream: fix double word; ok dtucker@ - - OpenBSD-Commit-ID: e6aff005914fa350b896d2be030be3d3b56ec0e8 - -commit b05fda224bbcd2f641254534ed2175c42487f3c8 -Author: Darren Tucker -Date: Thu Jul 25 17:59:35 2024 +1000 - - Check for SA_RESTART before using it. - - ok djm@ - -commit c276672fc0e99f0c4389988d54a84c203ce325b6 -Author: Yuichiro Naito -Date: Wed Sep 1 10:19:32 2021 +0900 - - Class-imposed login restrictions - - If the following functions are available, - add an additional check if users are allowed to login imposed by login class. - - * auth_hostok(3) - * auth_timeok(3) - - These functions are implemented on FreeBSD. - -commit 7717b9e9155209916cc6b4b4b54f4e8fa578e889 -Author: djm@openbsd.org -Date: Wed Jul 10 21:58:34 2024 +0000 - - upstream: correct keyword; from Yatao Su via GHPR509 - - OpenBSD-Commit-ID: 81c778c76dea7ef407603caa157eb0c381c52ad2 - -commit f2b78bb8f149d6b4d1f62c21aa1f06995dccf4ce -Author: djm@openbsd.org -Date: Mon Jul 8 03:04:34 2024 +0000 - - upstream: don't need return at end of void function - - OpenBSD-Commit-ID: 42d322d37f13aa075ae7b1ad9eef591e20b89717 - -commit a395d37a813c0177cb5bfc4bebf5a52badb73cf0 -Author: djm@openbsd.org -Date: Thu Jul 4 22:53:59 2024 +0000 - - upstream: fix grammar: "a pattern lists" -> "one or more pattern - - lists" - - OpenBSD-Commit-ID: f3c844763398faa9800687e8ff6621225498202a - -commit 8b664df75966e5aed8dabea00b8838303d3488b8 -Author: Darren Tucker -Date: Sun Jul 7 18:46:19 2024 +1000 - - Cast to sockaddr * in systemd interface. - - Fixes build with musl libx. bz#3707. - -commit 30c8c81da2169e78357d08dbb0ddd823b60e93bc -Author: Darren Tucker -Date: Thu Jul 4 20:12:26 2024 +1000 - - Add 9.8 branch to ci-status page. - -commit ee6b9e661633fcefd29dba0c811cecbc4d027f6f -Author: Samuel Thibault -Date: Tue Mar 26 22:15:08 2024 +0100 - - Fix detection of setres*id on GNU/Hurd - - Like Linux, proper _SOURCE macros need to be set to get declarations of - various standard functions, notably setres*id. Now that Debian is using - -Werror=implicit-function-declaration this is really required. While at - it, define other _SOURCE macros like on GNU/Linux, since GNU/Hurd uses - the same glibc. - -commit 52bc5fd19cb532ab4262389165ae529779004b03 -Merge: 783d8b2b8 ad1e0186c -Author: Chris Rapier -Date: Tue Jul 2 16:06:08 2024 -0400 - - Merge pull request #90 from rapier1/dev_minor - - Resolve CVE aka regreSSHion bug. - -commit ad1e0186c1ce03e9dbb13ce62637e33b69ced20d -Author: Chris Rapier -Date: Tue Jul 2 14:11:46 2024 -0400 - - Had an ifdef in the wrong place. - - The ifdef add to log.c was in the wrong place and - throwing an error for unused argument - -commit 93fa8bf0f970c0c1afe34f8d980602d1f1da2222 -Author: Chris Rapier -Date: Tue Jul 2 14:08:11 2024 -0400 - - Resolve CVE aka regreSSHion bug. - - This incorporates the fixes provided by DJM. This is a - backport to 9.7 unti we can get the 9.8 port working - correctly. - -commit 6e97c21cee0828ebc528c3a8d081f8b47c3c862b -Author: Chris Rapier -Date: Tue Jul 2 12:10:51 2024 -0400 - - More adjustments to CI tests - -commit 8e0a546b549fed29875820653a5709206527b591 -Merge: 3fc03e9d4 032af0555 -Author: Chris Rapier -Date: Mon Jul 1 14:34:01 2024 -0400 - - Merge pull request #86 from klardotsh/klardotsh/restore-disablemtaes - - cipher: Restore DisableMTAES capability to resolve FIPS SIGSEGV. - -commit 3fc03e9d4e302027457fe7dfed44674a2fbeca8d -Author: Chris Rapier -Date: Mon Jul 1 14:12:56 2024 -0400 - - Error in workflow file. Missed a tab. - -commit 9d60bf8bfd21b2373112d5a71adbc7ec83bca0d6 -Author: Chris Rapier -Date: Mon Jul 1 14:12:04 2024 -0400 - - Error in workflow file. Tabs need to be spaces. - -commit b664c446cfa8fdcc105a9dc1e144cd47347d30bb -Author: Chris Rapier -Date: Mon Jul 1 14:10:59 2024 -0400 - - Error in workflow file. - - That didn't work. Trying to convert tabs to spaces now. - -commit 47fd3fb2244ad16c15f8c50f18e45c364c32f32b -Author: Chris Rapier -Date: Mon Jul 1 14:08:19 2024 -0400 - - Error in workflow file. - - Trying to use ubuntu-24.04 as a target but that might be - throwing an error. This is a test to see if removing that - fixes the issue - -commit 9aefbefab71e4802c5a61abe2a5b99fc44fd6cfb -Author: Chris Rapier -Date: Mon Jul 1 14:05:14 2024 -0400 - - Update c-cpp workflow for github regression tests. - - I had been using Ubuntu 24.04 as the target platform for everything - however, that release doesn't have access to a number of the - clang and gcc versions we are testing so I had to roll those - back. This may require more tuning. - -commit f6d478a40c76165baeaa20a6e0a92504058d4e44 -Merge: cac53c99c fa41f6592 -Author: Chris Rapier -Date: Mon Jul 1 11:53:33 2024 -0400 - - Merge to release version of OpenSSH 9.8 - - This will be HPN-SSH 18.5. - -commit cac53c99ced963ce2795a2ff4dcf7115637284d5 -Merge: a05465635 cfe243cd9 -Author: Chris Rapier -Date: Mon Jul 1 11:34:01 2024 -0400 - - Port to 9.8 - -commit fa41f6592ff1b6ead4a652ac75af31eabb05b912 -Author: Damien Miller -Date: Mon Jul 1 14:33:26 2024 +1000 - - version numbers - -commit bfebb8a5130a792c5356bd06e1ddef72a0a0449f -Author: djm@openbsd.org -Date: Mon Jul 1 04:31:59 2024 +0000 - - upstream: openssh-9.8 - - OpenBSD-Commit-ID: 5f8b89e38a4c5f7c6d52ffa19f796d49f36fab19 - -commit 146c420d29d055cc75c8606327a1cf8439fe3a08 -Author: djm@openbsd.org -Date: Mon Jul 1 04:31:17 2024 +0000 - - upstream: when sending ObscureKeystrokeTiming chaff packets, we - - can't rely on channel_did_enqueue to tell that there is data to send. This - flag indicates that the channels code enqueued a packet on _this_ ppoll() - iteration, not that data was enqueued in _any_ ppoll() iteration in the - timeslice. ok markus@ - - OpenBSD-Commit-ID: 009b74fd2769b36b5284a0188ade182f00564136 - -commit 637e4dfea4ed81264e264b6200172ce319c64ead -Author: djm@openbsd.org -Date: Mon Jul 1 03:10:19 2024 +0000 - - upstream: use "lcd" to change directory before "lls" rather then "cd", - - since the directory we're trying to list is local. Spotted by Corinna - Vinschen - - OpenBSD-Regress-ID: 821feca4a4bebe491944e624c8f7f2990b891415 - -commit 032af05556ae5f2c345c45135100edf5066f2b7b -Author: Josh Klar -Date: Fri Jun 28 17:31:46 2024 -0700 - - cipher: Restore DisableMTAES capability to resolve FIPS SIGSEGV. - -commit c8cfe258cee0b8466ea84597bf15e1fcff3bc328 -Author: djm@openbsd.org -Date: Thu Jun 27 23:01:15 2024 +0000 - - upstream: delete obsolete comment - - OpenBSD-Commit-ID: 5fb04f298ed155053f3fbfdf0c6fe7cdf84bbfa2 - -commit 94b9d37100f6fa536aaa1d1a0e4926fe44fbf04d -Author: djm@openbsd.org -Date: Thu Jun 27 22:36:44 2024 +0000 - - upstream: retire unused API - - OpenBSD-Commit-ID: 3e30d7b0615e2707f6bbe70f61b1c2f72f78161b - -commit 268c3a7f5783e731ed60f4e28da66ee3743581d3 -Author: jmc@openbsd.org -Date: Thu Jun 27 21:02:16 2024 +0000 - - upstream: ssl(8) no longer contains a HISTORY section; - - OpenBSD-Commit-ID: 83b7ff34433d79595e9c2a5d2a561a6660251245 - -commit 12b6cc09ce6c430681f03af2a8069e37a664690b -Author: djm@openbsd.org -Date: Wed Jun 26 23:47:46 2024 +0000 - - upstream: move child process waitpid() loop out of SIGCHLD handler; - - ok deraadt - - OpenBSD-Commit-ID: 65815a39564e431414aed7c5ace8076f4e9ca741 - -commit d6bcd13297c2ab8b528df5a6898f994734849031 -Author: deraadt@openbsd.org -Date: Wed Jun 26 23:16:52 2024 +0000 - - upstream: Instead of using possibly complex ssh_signal(), write all - - the parts of the grace_alarm_handler() using the exact things allowed by the - signal-safe rules. This is a good rule of thumb: Handlers should be written - to either set a global volatile sig_atomic_t inspected from outside, and/or - directly perform only safe operations listed in our sigaction(2) manual page. - ok djm markus - - OpenBSD-Commit-ID: 14168ae8368aab76e4ed79e17a667cb46f404ecd - -commit b8793e2b0851f7d71b97554fa5260b23796d6277 -Author: deraadt@openbsd.org -Date: Wed Jun 26 23:14:14 2024 +0000 - - upstream: save_errno wrappers inside two small signal handlers that - - perform system calls, for systems with libc that do perform libc sigtramps. - ok djm markus - - OpenBSD-Commit-ID: 7749b56419a7c9dcfe4c6c04811e429813346c62 - -commit f23e9332c4c8df37465c4a4f38275ea98980ed7e -Author: jmc@openbsd.org -Date: Mon Jun 24 06:59:39 2024 +0000 - - upstream: - uppercase start of sentence - correct sentence grammar - - ok djm - - OpenBSD-Commit-ID: 1ec4b0fdb633a43667f2c8fff1d600bd647dde25 - -commit 1839e3eb71a759aa795602c1e4196300f4ac2615 -Author: djm@openbsd.org -Date: Mon Jun 24 04:05:11 2024 +0000 - - upstream: mention SshdSessionPath option - - OpenBSD-Commit-ID: c29734d36c21003973b15c1c9965c35f36cef30c - -commit 603193e32aef5db7d60c58066d5de89806e79312 -Author: Darren Tucker -Date: Thu Jun 20 18:45:14 2024 +1000 - - Rerun upstream tests on .sh file changes too. - -commit dbbf9337c19381786a8e5a8a49152fe6b80c780d -Author: dtucker@openbsd.org -Date: Thu Jun 20 08:23:18 2024 +0000 - - upstream: Work around dbclient cipher/mac query bug. - - Unlike earlier versions, recent Dropbear (at least v2024.85) requires - a host arg when querying supported ciphers and macs via "-c/-m - help". Earlier versions accept but do not require it, so always - provide it. If these queries fail, skip the test with a warning. - - OpenBSD-Regress-ID: 98eb863a3f0363416922efb273885e6b3c7f68d4 - -commit 8de2c8cebc46bbdb94b7a2c120fcadfb66a3cccc -Author: dtucker@openbsd.org -Date: Thu Jun 20 08:18:34 2024 +0000 - - upstream: Remove dropbear key types not supported - - by current OpenSSH. Allows subsequent test runs to work if OpenSSH is - rebuilt w/out OpenSSL. - - OpenBSD-Regress-ID: e0129eb2b1d31771105903a8055216fbba20a770 - -commit e9b6471c59b21e5d9ef1b3832d4bf727338add85 -Author: djm@openbsd.org -Date: Thu Jun 20 00:18:05 2024 +0000 - - upstream: stricter check for overfull tables in penalty record path - - OpenBSD-Commit-ID: 7df01e648a0723418c554e64a9f2b6d38db060a6 - -commit d9336d344eb2a1e898c5e66147b3f108c7214694 -Author: djm@openbsd.org -Date: Wed Jun 19 23:24:47 2024 +0000 - - upstream: put back reaping of preauth child process when writes - - from the monitor fail. Not sure how this got lost in the avalanche of - patches. - - OpenBSD-Commit-ID: eb7eb36371e1ac01050b32b70fb2b3e5d98e72f5 - -commit 579d9adb70ec0206a788eb5c63804c31a67e9310 -Author: naddy@openbsd.org -Date: Mon Jun 17 13:50:18 2024 +0000 - - upstream: remove one more mention of DSA - - OpenBSD-Commit-ID: 8515f55a15f02836ba657df341415f63c60526ca - -commit 7089b5f8436ef0b8d3d3ad9ce01045fb9e7aab15 -Author: Darren Tucker -Date: Wed Jun 19 23:09:05 2024 +1000 - - Move -f to the place needed to restart sshd. - -commit d5f83cfd852b14a25f347f082ab539a9454702ad -Author: Darren Tucker -Date: Wed Jun 19 21:04:01 2024 +1000 - - Need to supply "-f" to restart sshd. - -commit fad34b4ca25c0ef31e5aa841d461b6f21da5b8c1 -Author: dtucker@openbsd.org -Date: Wed Jun 19 10:15:51 2024 +0000 - - upstream: Provide defaults for ciphers and macs - - if querying for them fails since on some versions of Dropbear (at least - v2024.85) "-m help" doesn't seem to work. Enable all supported pubkey - algorithms in the server. - - OpenBSD-Regress-ID: 4f95556a49ee9f621789f25217c367a33d2745ca - -commit 5521060e35ada9f957cecdddc06d0524e75409ef -Author: dtucker@openbsd.org -Date: Wed Jun 19 10:10:46 2024 +0000 - - upstream: Use ed25519 keys for kex tests - - since that's supported by OpenSSH even when built without OpenSSL. - Only test diffie-hellman kex if OpenSSH is compiled with support for it. - - OpenBSD-Regress-ID: a5d09ef9bbd171f9e4ec73ed0d9eeb49a8878e97 - -commit dbd3b833f6e3815e58f2dc6e14f61a51bcd4d6bd -Author: dtucker@openbsd.org -Date: Wed Jun 19 10:08:34 2024 +0000 - - upstream: Rework dropbear key setup - - to always generate ed25519 keys, other types only if OpenSSH has support - for the corresponding key type. - - OpenBSD-Regress-ID: 8f91f12604cddb9f8d93aa34f3f93a3f6074395d - -commit d6218504e11ae9148adf410fc69b0710a052be36 -Author: Darren Tucker -Date: Wed Jun 19 20:20:24 2024 +1000 - - Restart sshd after installing it for testing. - - When installing an sshd built without OpenSSL the mismatch between - the running sshd and newly installed sshd-session will cause the - remainder of the test to fail. - -commit 786a4465b6bb702daf4fb17b7c3bcb42b52f0b46 -Author: Darren Tucker -Date: Tue Jun 18 19:59:59 2024 +1000 - - Remove macos-11 runner. - - Github is retiring them soon. - -commit df1c72a55edbebac14363b57de66ac6a147ecc67 -Author: Damien Miller -Date: Wed Jun 19 09:34:34 2024 +1000 - - PAMServiceName may appear in a Match block - -commit de1c2e70e5a5dc3c8d2fe04b24cc93d8ef6930e7 -Author: dtucker@openbsd.org -Date: Tue Jun 18 08:11:48 2024 +0000 - - upstream: Re-enable ssh-dss tests - - ... if ssh is compiled with DSA support - - OpenBSD-Regress-ID: bbfaf8c17f2b50a2d46ac35cb97af99b990c990d - -commit dabc2c7cf3c141e8e5d5a1a60d6c1d2d2422cf43 -Author: anton@openbsd.org -Date: Tue Jun 18 06:14:27 2024 +0000 - - upstream: Stop using DSA in dropbear interop tests. - - OpenBSD-Regress-ID: abfd4457d99d8cc1417fd22ca2c570270f74c1cf - -commit 761438012710169445acc179e3870c53c862bda0 -Author: Damien Miller -Date: Tue Jun 18 12:29:45 2024 +1000 - - missed a bit of DSA in the fuzzer - -commit 3f9cc47da588e8de520720e59f98438043fdaf93 -Author: Damien Miller -Date: Tue Jun 18 09:35:53 2024 +1000 - - DSA support is disabled, so remove from fuzzers - -commit 00eb95957dea5484b2c7c043f7d2bbc87301bef2 -Author: djm@openbsd.org -Date: Mon Jun 17 08:30:29 2024 +0000 - - upstream: disable the DSA signature algorithm by default; ok - - markus@ - - (yes, I know this expands to "the Digitial Signature Algorithm - signature algorithm) - - OpenBSD-Commit-ID: 961ef594e46dd2dcade8dd5721fa565cee79ffed - -commit 5603befe11c9464ea26fe77cbacc95a7cc0b1ea7 -Author: djm@openbsd.org -Date: Mon Jun 17 08:28:31 2024 +0000 - - upstream: promote connection-closed messages from verbose to info - - log level; they could be the only record of the connection terminating if the - client doesn't send a SSH2_MSG_DISCONNECT message. ok dtucker@ - - OpenBSD-Commit-ID: 0c8bfaf5e9fdff945cee09ac21e641f6c5d65d3c - -commit b00331402fe5c60d577f3ffcc35e49286cdc6b47 -Author: Damien Miller -Date: Mon Jun 17 17:02:18 2024 +1000 - - propagate PAM crashes to PerSourcePenalties - - If the PAM subprocess crashes, exit with a crash status that will be - picked up by the sshd(8) listener process where it can be used by - PerSourcePenalties to block the client. This is similar handling to - the privsep preauth process. - -commit 1c207f456ace38987deda047758d13fbf857f948 -Author: Damien Miller -Date: Mon Jun 17 15:06:01 2024 +1000 - - minix doesn't have loopback, so skip penalty tests - - pointed out by dtucker@ - -commit 48443d202eaec52d4d39defdd709a4499a7140c6 -Author: djm@openbsd.org -Date: Sun Jun 16 11:54:49 2024 +0000 - - upstream: same treatment for this test - - OpenBSD-Regress-ID: d0cc9efca7833e673ea7b0cb3a679a3acee8d4c7 - -commit 45562a95ea11d328c22d97bf39401cd29684fb1f -Author: djm@openbsd.org -Date: Sun Jun 16 08:18:06 2024 +0000 - - upstream: penalty test is still a bit racy - - OpenBSD-Regress-ID: 90c9ac224db454637baf1ebee5857e007321e824 - -commit 8d0f7eb147ef72d18acb16c0b18672d44941a8ca -Author: djm@openbsd.org -Date: Sat Jun 15 03:59:10 2024 +0000 - - upstream: crank up penalty timeouts so this should work on even the - - slowest of test builders - - OpenBSD-Regress-ID: 70bda39c83e3fc9d0f3c1fad4542ed33e173d468 - -commit 93c75471a1202ab3e29db6938648d4e2602c0475 -Author: jmc@openbsd.org -Date: Fri Jun 14 05:20:34 2024 +0000 - - upstream: sort -q in the options list; - - OpenBSD-Commit-ID: 6839b38378f38f754de638a5e988c13b4164cc7c - -commit dd7807bbe80a93ffb4616f2bd5cf83ad5a5595fb -Author: djm@openbsd.org -Date: Fri Jun 14 05:01:22 2024 +0000 - - upstream: clarify KEXAlgorithms supported vs available. Inspired by - - bz3701 from Colin Watson. - - OpenBSD-Commit-ID: e698e69bea19bd52971d253f2b1094490c4701f7 - -commit d172ad56df85b68316dbadbedad16761a1265874 -Author: djm@openbsd.org -Date: Fri Jun 14 05:00:42 2024 +0000 - - upstream: ssh-keyscan -q man bits - - OpenBSD-Commit-ID: ba28d0e1ac609a4c99c453e57e86560c79079db1 - -commit 092e4ff9ccaacbe035f286feb1b56ed499604743 -Author: Damien Miller -Date: Fri Jun 14 14:46:35 2024 +1000 - - skip penalty-expire test in valgrind test env - -commit 2866ad08a9c50d7b67ce9424ca990532b806a21a -Author: djm@openbsd.org -Date: Fri Jun 14 04:43:11 2024 +0000 - - upstream: split the PerSourcePenalties test in two: one tests penalty - - enforcement but not penalty expiry, the other tests penalty expiry. - - This lets us disable the expiry testing in certain CI test environments. - - OpenBSD-Regress-ID: f56811064f3e3cb52ee73a206b8c2a06af1c8791 - -commit b2c64bc170d75823622a37cab3ca1804ca87ad16 -Author: Damien Miller -Date: Fri Jun 14 14:19:23 2024 +1000 - - add a sshd_config PamServiceName option - - Allows selecting which PAM service name to use when UsePAM is - enabled. Defaults to "sshd" unless overridden at compile time - by defining SSHD_PAM_SERVICE. - - bz2102, ok dtucker@ - -commit 9f032a4dd17bf0ae6066223d82aa5e784285d987 -Author: djm@openbsd.org -Date: Fri Jun 14 00:26:12 2024 +0000 - - upstream: don't redirect stderr for ssh-keyscan we expect to succeed - - OpenBSD-Regress-ID: 8878b8eb4e070ed2e343166d3eb86db4a08a216c - -commit 1e84d0cf40e94ae3a77d6a7ca8c036d8e3d55a40 -Author: djm@openbsd.org -Date: Fri Jun 14 00:25:25 2024 +0000 - - upstream: make host/banner comments go to stderr instead of stdout, - - so they are useful as comments without extra shell redirection and so they - don't clutter actual errors on stderr. - - Add a -q flag to shut them up. - - ok dtucker@ - - OpenBSD-Commit-ID: bec813de56a71adb5c1a76adcf49621130d24264 - -commit 3e806d011855d6bd648ec95b9df630ebbd11c3bf -Author: naddy@openbsd.org -Date: Thu Jun 13 15:06:33 2024 +0000 - - upstream: separate keywords with comma - - OpenBSD-Commit-ID: d65a99666202a8188c4991c18d14374a229f7be5 - -commit abfd1f7a3cbd0a92581a0febba254b2f6649c0d9 -Author: djm@openbsd.org -Date: Fri Jun 14 00:23:55 2024 +0000 - - upstream: specify an algorithm for ssh-keyscan, otherwise it will make - - multiple attempts simultaneously and confuse the test - - OpenBSD-Regress-ID: 6e910f3315c4345053db1bf5cbf61826b194d0b9 - -commit a8fbe2f7d0d96d299ee8e69769e3b51067978748 -Author: Damien Miller -Date: Thu Jun 13 16:41:29 2024 +1000 - - sshd: don't use argv[0] as PAM service name - - sshd would implicitly use argv[0] as the PAM service name to - allow people to select different PAM service names by making - differently-named copies/links to the sshd binary. - - Splitting sshd into sshd/sshd-session broke this, as the process - that starts PAM is always sshd-session and the user has no control - over this. - - Hardcode "sshd" as the default PAM service name unless/until we - figure out a better way. Should unbreak OSX integration tests. - -commit bf204bd05c3ae650f87e2b96527688579f59774c -Author: Damien Miller -Date: Thu Jun 13 15:00:28 2024 +1000 - - prepare for checking in autogenerated files - - We plan to check in automatically generated files (config.h.in, etc) on - release branches. These files are normally ignored by .gitignore, but - this shuffles the contents of this file to make it easy to un-ignore - them. - -commit 425f79a837489904c343b349ef00e09aeaa4e752 -Author: Damien Miller -Date: Thu Jun 13 14:41:33 2024 +1000 - - typo in comment - -commit afe10313c1fa8d478af399ee7d54c8f85503013b -Author: Damien Miller -Date: Thu Jun 13 14:35:25 2024 +1000 - - fix PTY allocation on Cygwin, broken by sshd split - - Cygwin doesn't support FD passing and so used to disable post-auth - privilege separation entirely because privsep requires PTY allocation - to happen in the privileged monitor process with the PTY file - descriptors being passed back to the unprivileged process. - - This brings back a minimal version of the previous special treatment - for Cygwin (and any other platform that sets DISABLE_FD_PASSING): - privilege separation remains enabled, but PTY allocation happens in - the post-auth user process rather than the monitor. - - This either requires PTY allocation to not need privilege to begin - with (this appears to be the case on Cygwin), or the post-auth - privsep process retain privilege (other platforms that set the - DISABLE_FD_PASSING option). - - Keeping privileges here is bad, but the non-Cygwin systems that set - DISABLE_FD_PASSING are so deeply legacy that this is likely to be the - least of their problems. - -commit f66d4df5749551380a8c4ae642347675a0b6a2e9 -Author: Damien Miller -Date: Thu Jun 13 11:33:09 2024 +1000 - - delay lookup of privsep user until config loaded - - sshd-session attempting to use options.kerberos_authentication to - decide whether it needed to lookup the privsep user before the - configuration was loaded. This caused it to get a placeholder value - that caused it always to try to lookup the privsep user, breaking at - least one test environment. - -commit f1c42858b94f5d9b58867b34dce3afb39c6b56a8 -Author: Damien Miller -Date: Thu Jun 13 11:16:57 2024 +1000 - - missing file for PerSourcePenalties regress test - -commit 4de80ff4e6fab5a6bb0028e7d57c6c23d1485adb -Author: djm@openbsd.org -Date: Wed Jun 12 22:36:00 2024 +0000 - - upstream: split PerSourcePenalties address tracking. Previously it - - used one shared table and overflow policy for IPv4 and IPv6 addresses, now it - will use separate tables and optionally different overflow policies. - - This prevents misbehaviour from IPv6 addresses (which are vastly easier - to obtain many of) from affecting IPv4 connections and may allow for - stricter overflow policies. - - ok deraadt@ - - OpenBSD-Commit-ID: 12637ed0aa4d5f1f3e702da42ea967cbd8bfdfd9 - -commit 06ab4c6931b0aaa4334db2faaa7e1069e76d0df6 -Author: jmc@openbsd.org -Date: Tue Jun 11 05:24:39 2024 +0000 - - upstream: do not mark up "(default: 20ms)"; - - OpenBSD-Commit-ID: 54151ecdecfa1b67dcdda4fd24826ef6e2148ad4 - -commit b0135edd5f8cb3f42d5b2575c99f1c52a9e2182f -Author: Chris Rapier -Date: Tue Jun 11 13:09:34 2024 -0400 - - Add hpnsshd-session to .gitignore - -commit cfe243cd9fde148ed060637876e27bb55ac78be9 -Author: djm@openbsd.org -Date: Tue Jun 11 02:54:51 2024 +0000 - - upstream: reap preauth net child if it hangs up during privsep message - - send, not just message receive - - OpenBSD-Commit-ID: 02a093f4ab4f8f83f0cd1ea2bb35b9ca420448f0 - -commit b0a711c00b9c64afd1c9d6fb538275c6604a2676 -Author: djm@openbsd.org -Date: Tue Jun 11 01:58:27 2024 +0000 - - upstream: fix PIDFILE handling, broken for SUDO=doas in last commit - - here - - OpenBSD-Regress-ID: 96fec579af228f87a036e94801eb294af9074625 - -commit 90fb801e2d9241be50a2a7ff79428386442a041f -Author: djm@openbsd.org -Date: Tue Jun 11 02:00:30 2024 +0000 - - upstream: reap the pre-auth [net] child if it hangs up during privsep - - message sending, not just receiving - - OpenBSD-Commit-ID: f7341605bf08c4c15830910446e6775323f2f8cb - -commit ef878d58798f6688c7f4d4e417dc0c29023ea831 -Author: djm@openbsd.org -Date: Tue Jun 11 01:23:25 2024 +0000 - - upstream: a little more RB_TREE paranoia - - OpenBSD-Commit-ID: 8dc2fd21eebd8830c4a4d25461ac4fe228e11156 - -commit fc4e96b2174d6a894d2033421699d091679baced -Author: djm@openbsd.org -Date: Tue Jun 11 01:22:25 2024 +0000 - - upstream: fix off-by-one comparison for PerSourcePenalty - - OpenBSD-Commit-ID: af4f5d01c41ef870b23e55655bfbf73474a6c02b - -commit 82c836df4ff41145553cd7adb11c5b985aeaa06f -Author: djm@openbsd.org -Date: Tue Jun 11 01:21:41 2024 +0000 - - upstream: move tree init before possible early return - - OpenBSD-Commit-ID: 72e2c5b69f151c08a7c5bf5ad929b97a92c273df - -commit a2300f015cc4939c4d9c564b58b74e71202dc978 -Author: djm@openbsd.org -Date: Tue Jun 11 01:07:35 2024 +0000 - - upstream: update to mention that PerSourcePenalties default to - - being enabled and document the default values for each parameter. - - OpenBSD-Commit-ID: b981288bddfb097aad269f62df4081c688ce0034 - -commit 41987efd356d3fc30139aeab4b09374acf8f91a0 -Author: djm@openbsd.org -Date: Tue Jun 11 00:44:52 2024 +0000 - - upstream: reap the [net] child if it hangs up while writing privsep - - message payloads, not just the message header - - OpenBSD-Commit-ID: 24dbd400aa381ac96be7ed2dd49018487dfef6ce - -commit 6211aa085fa91155a24922e5329576ac9a8f3175 -Author: djm@openbsd.org -Date: Tue Jun 11 00:40:21 2024 +0000 - - upstream: log waitpid() status for abnormal exits - - OpenBSD-Commit-ID: b317930e06b51819c1a2bc6a4359764fecfb1c2d - -commit a59634c7adb9ae988748d99963dfafb3070d8d41 -Author: djm@openbsd.org -Date: Tue Jun 11 00:36:20 2024 +0000 - - upstream: correct error message - - OpenBSD-Commit-ID: 581f60f73099083392887206860229ab104620ed - -commit fa7d7a667f2ee031e72873e36de2d2a36bca973b -Author: deraadt@openbsd.org -Date: Fri Jun 7 13:23:30 2024 +0000 - - upstream: avoid shadowing issues which some compilers won't accept - - ok djm - - OpenBSD-Commit-ID: 1e89572397dda83433d58c4fa6333a08f51170d4 - -commit 3ad4cd9eeca5c9bc6706db44b6de88e2e4513fd6 -Author: jmc@openbsd.org -Date: Thu Jun 6 21:14:49 2024 +0000 - - upstream: escape the final dot at eol in "e.g." to avoid double - - spacing; - - OpenBSD-Commit-ID: 0a9fb10bc9f7d577afe2da3f498a08bc431115b9 - -commit 0e0c69761a4c33ccd4a256560f522784a753d1a8 -Author: djm@openbsd.org -Date: Thu Jun 6 20:25:48 2024 +0000 - - upstream: enable PerSourcePenalties by default. - - ok markus - - NB. if you run a sshd that accepts connections from behind large NAT - blocks, proxies or anything else that aggregates many possible users - behind few IP addresses, then this change may cause legitimate traffic - to be denied. - - Please read the PerSourcePenalties, PerSourcePenaltyExemptList and - PerSourceNetBlockSize options in sshd_config(5) for how to tune your - sshd(8) for your specific circumstances. - - OpenBSD-Commit-ID: 24a0e5c23d37e5a63e16d2c6da3920a51078f6ce - -commit bd1f74741daabeaf20939a85cd8cec08c76d0bec -Author: djm@openbsd.org -Date: Thu Jun 6 20:20:42 2024 +0000 - - upstream: mention that PerSourcePenalties don't affect concurrent - - in-progress connections. - - OpenBSD-Commit-ID: 20389da6264f2c97ac3463edfaa1182c212d420c - -commit 9774b938578327d88a651f4c63c504809717590a -Author: djm@openbsd.org -Date: Thu Jun 6 19:49:25 2024 +0000 - - upstream: regress test for PerSourcePenalties - - OpenBSD-Regress-ID: a1af13d411b25a727742644459d26480b9a1b0f1 - -commit b8ebd86cefe9812204a10c028dc90de29918667d -Author: djm@openbsd.org -Date: Thu Jun 6 19:48:40 2024 +0000 - - upstream: make sure logs are saved from sshd run via start_sshd - - OpenBSD-Regress-ID: de4ef0e32e3ab85ff3a6c36eb08d1909c0dd1b4a - -commit d7b2070bdaa4ebbfafb9975c1d5a62b73289d31f -Author: djm@openbsd.org -Date: Thu Jun 6 19:47:48 2024 +0000 - - upstream: simplify - - OpenBSD-Regress-ID: 50316e0d1ae0c0a057a45af042253e54ce23d11c - -commit e6ea3d224513b6bfb93818809d4c7397f5995ba2 -Author: djm@openbsd.org -Date: Thu Jun 6 18:48:13 2024 +0000 - - upstream: prepare for PerSourcePenalties being enabled by default - - in future - - OpenBSD-Regress-ID: 5236c6d1c823997aac5a35e2915da30f1903bec7 - -commit c0cb3b8c837761816a60a3cdb54062668df09652 -Author: djm@openbsd.org -Date: Thu Jun 6 19:50:01 2024 +0000 - - upstream: disable stderr redirection before closing fds - - OpenBSD-Commit-ID: d42cb895ee4542098050367fc35321c9303f003a - -commit 81c1099d22b81ebfd20a334ce986c4f753b0db29 -Author: djm@openbsd.org -Date: Thu Jun 6 17:15:25 2024 +0000 - - upstream: Add a facility to sshd(8) to penalise particular - - problematic client behaviours, controlled by two new sshd_config(5) options: - PerSourcePenalties and PerSourcePenaltyExemptList. - - When PerSourcePenalties are enabled, sshd(8) will monitor the exit - status of its child pre-auth session processes. Through the exit - status, it can observe situations where the session did not - authenticate as expected. These conditions include when the client - repeatedly attempted authentication unsucessfully (possibly indicating - an attack against one or more accounts, e.g. password guessing), or - when client behaviour caused sshd to crash (possibly indicating - attempts to exploit sshd). - - When such a condition is observed, sshd will record a penalty of some - duration (e.g. 30 seconds) against the client's address. If this time - is above a minimum threshold specified by the PerSourcePenalties, then - connections from the client address will be refused (along with any - others in the same PerSourceNetBlockSize CIDR range). - - Repeated offenses by the same client address will accrue greater - penalties, up to a configurable maximum. A PerSourcePenaltyExemptList - option allows certain address ranges to be exempt from all penalties. - - We hope these options will make it significantly more difficult for - attackers to find accounts with weak/guessable passwords or exploit - bugs in sshd(8) itself. - - PerSourcePenalties is off by default, but we expect to enable it - automatically in the near future. - - much feedback markus@ and others, ok markus@ - - OpenBSD-Commit-ID: 89ded70eccb2b4926ef0366a4d58a693de366cca - -commit 916b0b6174e203cf2c5ec9bcf409472eb7ffbf43 -Author: Damien Miller -Date: Fri Jun 7 03:31:02 2024 +1000 - - whitespace - -commit 49b55e44182b8294419aa580cbf043d5b9e3d953 -Author: deraadt@openbsd.org -Date: Tue Jun 4 15:14:45 2024 +0000 - - upstream: enable -fret-clean on amd64, for libc libcrypto ld.so - - kernel, and all the ssh tools. The dynamic objects are entirely ret-clean, - static binaries will contain a blend of cleaning and non-cleaning callers. - - OpenBSD-Commit-ID: 112aacedd3b61cc5c34b1fa6d9fb759214179172 - -commit cc80d51d034bcb24fd0f2564a4bdf1612000a2a2 -Author: Damien Miller -Date: Wed Jun 5 02:21:30 2024 +1000 - - remove PRIVSEP macros for osx - -commit 8785491123d4d722b310c20f383570be758f8263 -Author: djm@openbsd.org -Date: Sat Jun 1 07:03:37 2024 +0000 - - upstream: be really strict with fds reserved for communication with the - - separate sshd-session process - reserve them early and fatal if we can't - dup2(2) them later. The pre-split fallback to re-reading the configuration - files is not possible, so sshd-session absolutely requires the fd the - configuration is passed over to be in order. - - ok deraadt@ - - OpenBSD-Commit-ID: 308a98ef3c8a6665ebf92c7c9a0fc9600ccd7065 - -commit f1c8918cb98459910fb159373baea053ba4108c0 -Author: Damien Miller -Date: Fri May 31 19:12:26 2024 +1000 - - depend - -commit 94b4866cb1f4b0ed29a9f367047b30f81002316f -Author: Damien Miller -Date: Fri May 31 19:11:14 2024 +1000 - - rename need_privsep to need_chroot - - privsep is mandatory, chroot is optional (disabled when running - sshd as non-root) - -commit e68a95142e5024b144f8eeccd5ffdee42c34f44c -Author: Damien Miller -Date: Fri May 31 19:05:34 2024 +1000 - - remove remaining use_privsep mention - -commit b21d271f651d2536dca819cc6d74032fe98634db -Author: djm@openbsd.org -Date: Fri May 31 09:01:08 2024 +0000 - - upstream: warn when -r (deprecated option to disable re-exec) is - - passed - - OpenBSD-Commit-ID: 73145ef5150edbe3ce7889f0844ed8fa6155f551 - -commit a4b5bc246cbca476deeeb4462aa31746a56e3021 -Author: djm@openbsd.org -Date: Fri May 31 08:49:35 2024 +0000 - - upstream: typos - - OpenBSD-Commit-ID: edfa72eb06bfa65da30fabf7d2fe76d2d33f77bf - -commit 8054b906983ceaed01fabd8188d3dac24c05ba39 -Author: djm@openbsd.org -Date: Mon May 27 01:52:26 2024 +0000 - - upstream: don't need sys/queue.h here - - OpenBSD-Commit-ID: dd137396828171eb19e4911581812ca58de6c578 - -commit 210d4239733da6180ce853538aeb9413d5c62ad5 -Author: naddy@openbsd.org -Date: Sun May 26 20:35:12 2024 +0000 - - upstream: remove references to SSH1 and DSA server keys - - OpenBSD-Commit-ID: 57cc1c98d4f998981473734f144b904af7d178a2 - -commit f0b9261d7fdd0ef86806b49fe76344bd16770cd0 -Author: jsg@openbsd.org -Date: Thu May 23 23:47:16 2024 +0000 - - upstream: remove unused struct fwd_perm_list, no decl with complete - - type ok djm@ - - OpenBSD-Commit-ID: 416fb3970b7e73c76d2963c4f00cf96f2b2ee2fb - -commit 2477a98c3ef78e63b11a1393656e00288f52ae97 -Author: naddy@openbsd.org -Date: Wed May 22 15:24:55 2024 +0000 - - upstream: Do not pass -Werror twice when building with clang. - - OpenBSD-Commit-ID: 5f378c38ad8976d507786dc4db9283a879ec8cd0 - -commit 435844f5675245b4271f8581f15e6d1f34fde3bc -Author: miod@openbsd.org -Date: Wed May 22 11:49:36 2024 +0000 - - upstream: Do not pass -Werror if building with gcc 3, for asn1.h - - and bio.h cause (admittedly bogus) warnings with gcc 3. - - OpenBSD-Commit-ID: fb39324748824cb0387e9d67c41d1bef945c54ea - -commit fc5dc092830de23767c6ef67baa18310a64ee533 -Author: djm@openbsd.org -Date: Wed May 22 04:20:00 2024 +0000 - - upstream: this test has been broken since 2014, and has been - - testing the same key exchange algorithm repeatedly instead of testing all of - them. Spotted by nreilly AT blackberry.com in bz3692 - - Who broke the test? me. - - OpenBSD-Regress-ID: 48f4f5946276f975667141957d25441b3c9a50e2 - -commit fd4816791beaed2fdae7eea3e1494d1972b2a39d -Author: anton@openbsd.org -Date: Sun May 19 19:10:01 2024 +0000 - - upstream: Add missing kex-names.c source file required since the - - ssh split. - - OpenBSD-Regress-ID: ca666223f828fc4b069cb9016bff1eb50faf9fbb - -commit beccb7319c5449f6454889013403c336446d622e -Author: naddy@openbsd.org -Date: Fri May 17 14:42:00 2024 +0000 - - upstream: remove duplicate copy of relink kit for sshd-session - - OpenBSD-Commit-ID: 6d2ded4cd91d4d727c2b26e099b91ea935bed504 - -commit dcd79fa141311c287e0595ede684b7116122fae0 -Author: jsg@openbsd.org -Date: Fri May 17 06:42:04 2024 +0000 - - upstream: remove prototypes with no matching function; ok djm@ - - OpenBSD-Commit-ID: 6d9065dadea5f14a01bece0dbfe2fba1be31c693 - -commit 6454a05e7c6574d70adf17efe505a8581a86ca4f -Author: jsg@openbsd.org -Date: Fri May 17 06:38:00 2024 +0000 - - upstream: remove externs for removed vars; ok djm@ - - OpenBSD-Commit-ID: f51ea791d45c15d4927eb4ae7d877ccc1e5a2aab - -commit f3e4db4601ef7d2feb1d6f7447e432aaf353a616 -Author: deraadt@openbsd.org -Date: Fri May 17 06:11:17 2024 +0000 - - upstream: -Werror was turned on (probably just for development), - - and this is a simple way to satisfy older gcc. - - OpenBSD-Commit-ID: 7f698df54384b437ce33ab7405f0b86c87019e86 - -commit a054656351ba881f57b657d4ca68d0cdcdda33c7 -Merge: 24a1f3e5a 783d8b2b8 -Author: Chris Rapier -Date: Tue May 21 17:27:48 2024 -0400 - - Porting HPN-SSH to split sshd listener. - - OpenSSH is splitting sshd into a listener and an session daemon. - This commit is a first pass at porting HPN-SSH into that - configuration. It current passes all regression tests. - Functionality tests have not yet been conducted. - -commit 24a1f3e5ad6f4a49377d4c74c36637e9a239efd0 -Author: Damien Miller -Date: Fri May 17 14:50:43 2024 +1000 - - attempt at updating RPM specs for sshd-session - -commit 17b566eeb7a0c6acc9c48b35c08885901186f861 -Author: djm@openbsd.org -Date: Fri May 17 04:42:13 2024 +0000 - - upstream: g/c unused variable - - OpenBSD-Commit-ID: aa6ef0778a1f1bde0d73efba72a777c48d2bd010 - -commit 01fb82eb2aa0a4eaf5c394ea8bb37ea4c26f8a3f -Author: jsg@openbsd.org -Date: Fri May 17 02:39:11 2024 +0000 - - upstream: spelling; ok djm@ - - OpenBSD-Commit-ID: bdea29bb3ed2a5a7782999c4c663b219d2270483 - -commit b88b690e99145a021fc1a1a116a11e0bce0594e7 -Author: djm@openbsd.org -Date: Fri May 17 01:45:22 2024 +0000 - - upstream: allow overriding the sshd-session binary path - - OpenBSD-Regress-ID: 5058cd1c4b6ca1a15474e33546142931d9f964da - -commit a68f80f2511f0e0c5cef737a8284cc2dfabad818 -Author: anton@openbsd.org -Date: Wed Apr 3 06:01:11 2024 +0000 - - upstream: Since ssh-agent(1) is only readable by root by now, use - - ssh(1) while generating data in tests. - - OpenBSD-Regress-ID: 24eb40de2e6b0ace185caaba35e2d470331ffe68 - -commit 92e55890314ce2b0be21a43ebcbc043b4abc232f -Author: djm@openbsd.org -Date: Fri May 17 01:17:40 2024 +0000 - - upstream: fix incorrect debug option name introduce in previous - - commit - - OpenBSD-Commit-ID: 66d69e22b1c072c694a7267c847f212284614ed3 - -commit 4ad72878af7b6ec28da6e230e36a91650ebe84c1 -Author: deraadt@openbsd.org -Date: Fri May 17 00:33:25 2024 +0000 - - upstream: construct and install a relink-kit for sshd-session ok - - djm - - OpenBSD-Commit-ID: 8b3820adb4da4e139c4b3cffbcc0bde9f08bf0c6 - -commit 02e679a2cb3f6df8e9dbb1519ed578226485157f -Author: Damien Miller -Date: Fri May 17 12:21:27 2024 +1000 - - Makefile support for sshd-session - -commit c0416035c5eaf70a8450d11c8833c5f7068ee7ad -Author: djm@openbsd.org -Date: Fri May 17 00:32:32 2024 +0000 - - upstream: missing files from previous - - OpenBSD-Commit-ID: 4b7be4434d8799f02365552b641a7a70a7ebeb2f - -commit 03e3de416ed7c34faeb692967737be4a7bbe2eb5 -Author: djm@openbsd.org -Date: Fri May 17 00:30:23 2024 +0000 - - upstream: Start the process of splitting sshd into separate - - binaries. This step splits sshd into a listener and a session binary. More - splits are planned. - - After this changes, the listener binary will validate the configuration, - load the hostkeys, listen on port 22 and manage MaxStartups only. All - session handling will be performed by a new sshd-session binary that the - listener fork+execs. - - This reduces the listener process to the minimum necessary and sets us - up for future work on the sshd-session binary. - - feedback/ok markus@ deraadt@ - - NB. if you're updating via source, please restart sshd after installing, - otherwise you run the risk of locking yourself out. - - OpenBSD-Commit-ID: 43c04a1ab96cdbdeb53d2df0125a6d42c5f19934 - -commit 589a82705ac104776ac7426b06f95a85275add32 -Author: Chris Rapier -Date: Mon May 13 17:30:56 2024 -0400 - - Incorporate MPTCP from evrardco. - - See https://github.com/openssh/openssh-portable/pull/335/commits - This creates a new runtime option of UseMPTCP that will allow - HPN-SSH to make use of MultiPath TCP. This only works under Linux - at this point. - -commit 1c0d81357921f8d3bab06841df649edac515ae5b -Author: djm@openbsd.org -Date: Thu May 9 09:46:47 2024 +0000 - - upstream: simplify exit message handling, which was more complicated - - than it needed to be because of unexpunged ssh1 remnants. ok markus@ - - OpenBSD-Commit-ID: 8b0cd2c0dee75fb053718f442aa89510b684610b - -commit cbbbf76aa6cd54fce32eacce1300e7abcf9461d4 -Author: tobias@openbsd.org -Date: Mon May 6 19:26:17 2024 +0000 - - upstream: remove SSH1 leftovers - - Authored with Space Meyer - - ok djm - - OpenBSD-Commit-ID: 81db602e4cb407baae472689db1c222ed7b2afa3 - -commit bc5dcb8ab9a4e8af54a724883732af378f42ea78 -Author: tobias@openbsd.org -Date: Tue Apr 30 15:40:43 2024 +0000 - - upstream: never close stdin - - The sanitise_stdfd call makes sure that standard file descriptors are - open (if they were closed, they are connected with /dev/null). - - Do not close stdin in any case to prevent error messages when stdin is - read multiple times and to prevent later usage of fd 0 for connections, - e.g. - - echo localhost | ssh-keyscan -f - -f - - - While at it, make stdin-related error messages nicer. - - Authored with Max Kunzelmann - - ok djm - - OpenBSD-Commit-ID: 48e9b7938e2fa2f9bd47e6de6df66a31e0b375d3 - -commit 6a42b70e56bef1aacdcdf06352396e837883e84f -Author: Damien Miller -Date: Wed May 8 09:43:59 2024 +1000 - - sync getrrsetbyname.c with recent upstream changes - -commit 783d8b2b8262a87a21b104da5cf281b80345a0c2 -Merge: 4aa6f04fb bd7ad0305 -Author: Chris Rapier -Date: Tue Apr 30 17:28:58 2024 -0400 - - Merge pull request #83 from rapier1/release_candidates - - Official Release of 18.4.1 - -commit 385ecb31e147dfea59c1c488a1d2011d3867e60e -Author: djm@openbsd.org -Date: Tue Apr 30 06:23:51 2024 +0000 - - upstream: fix home-directory extension implementation, it always - - returned the current user's home directory contrary to the spec. - - Patch from Jakub Jelen via GHPR477 - - OpenBSD-Commit-ID: 5afd775eab7f9cbe222d7fbae4c793de6c3b3d28 - -commit 14e2b16bc67ffcc188906f65008667e22f73d103 -Author: djm@openbsd.org -Date: Tue Apr 30 06:16:55 2024 +0000 - - upstream: flush stdout after writing "sftp>" prompt when not using - - editline. - - From Alpine Linux via GHPR480 - - OpenBSD-Commit-ID: 80bdc7ffe0358dc090eb9b93e6dedb2b087b24cd - -commit 2e69a724051488e3fb3cd11531c4b5bc1764945b -Author: djm@openbsd.org -Date: Tue Apr 30 05:53:03 2024 +0000 - - upstream: stricter validation of messaging socket fd number; disallow - - usage of stderr. Based on GHPR492 by RealHurrison - - OpenBSD-Commit-ID: 73dbbe82ea16f73ce1d044d3232bc869ae2f2ce8 - -commit da757b022bf18c6f7d04e685a10cd96ed00f83da -Author: djm@openbsd.org -Date: Tue Apr 30 05:45:56 2024 +0000 - - upstream: add missing reserved fields to key constraint protocol - - documentation. - - from Wiktor Kwapisiewicz via GHPR487 - - OpenBSD-Commit-ID: 0dfb69998cfdb3fa00cbb0e7809e7d2f6126e3df - -commit 16d0b82fa08038f35f1b3630c70116979f49784f -Author: Damien Miller -Date: Tue Apr 30 12:39:34 2024 +1000 - - depend - -commit 66aaa678dbe59aa21d0d9d89a3596ecedde0254b -Author: djm@openbsd.org -Date: Tue Apr 30 02:14:10 2024 +0000 - - upstream: correctly restore sigprocmask around ppoll() reported - - by Tõivo Leedjärv; ok deraadt@ - - OpenBSD-Commit-ID: c0c0f89de5294a166578f071eade2501929c4686 - -commit 80fb0eb21551aed3aebb009ab20aeffeb01e44e0 -Author: djm@openbsd.org -Date: Tue Apr 30 02:10:49 2024 +0000 - - upstream: add explict check for server hostkey type against - - HostkeyAlgorithms. Allows HostkeyAlgorithms to disable implicit fallback from - certificate keys to plain keys. ok markus@ - - OpenBSD-Commit-ID: 364087e4a395ff9b2f42bf3aefdb2090bb23643a - -commit 5b28096d31ff7d80748fc845553a4aef5bb05d86 -Author: jsg@openbsd.org -Date: Tue Apr 23 13:34:50 2024 +0000 - - upstream: correct indentation; no functional change ok tb@ - - OpenBSD-Commit-ID: dd9702fd43de546bc6a3f4f025c74d6f3692a0d4 - -commit fd3cb8a82784e05f621dea5b56ac6f89bc53c067 -Author: semarie@openbsd.org -Date: Thu Apr 4 16:00:51 2024 +0000 - - upstream: set right mode on ssh-agent at boot-time - - which sthen@ - ok deraadt@ - - OpenBSD-Commit-ID: 662b5056a2c6171563e1626f9c69f27862b5e7af - -commit 54343a260e3aa4bceca1852dde31cd08e2abd82b -Author: deraadt@openbsd.org -Date: Tue Apr 2 12:22:38 2024 +0000 - - upstream: Oops, incorrect hex conversion spotted by claudio. - - While here try to improve how it reads a bit better. Surprising the - regression tests didn't spot this error, maybe it fails to roundtrip the - values. - - OpenBSD-Commit-ID: 866cfcc1955aef8f3fc32da0b70c353a1b859f2e - -commit ec78c31409590ad74efc194f886273ed080a545a -Author: deraadt@openbsd.org -Date: Tue Apr 2 10:02:08 2024 +0000 - - upstream: for parse_ipqos(), use strtonum() instead of mostly - - idiomatic strtoul(), but wow it's so gross. ok djm - - OpenBSD-Commit-ID: cec14a76af2eb7b225300c80fc0e21052be67b05 - -commit 8176e1a6c2e6da9361a7abb6fbf6c23c299f495b -Author: deraadt@openbsd.org -Date: Tue Apr 2 09:56:58 2024 +0000 - - upstream: can shortcut by returning strtonum() value directly; ok - - djm - - OpenBSD-Commit-ID: 7bb2dd3d6d1f288dac14247d1de446e3d7ba8b8e - -commit 9f543d7022a781f80bb696f9d73f1d1c6f9e31d6 -Author: deraadt@openbsd.org -Date: Tue Apr 2 09:52:14 2024 +0000 - - upstream: rewrite convtime() to use a isdigit-scanner and - - strtonum() instead of strange strtoul can might be fooled by garage - characters. passes regress/usr.bin/ssh/unittests/misc ok djm - - OpenBSD-Commit-ID: 4b1ef826bb16047aea3f3bdcb385b72ffd450abc - -commit 8673137f780d8d9e4cda3c4605cb5d88d5cea271 -Author: claudio@openbsd.org -Date: Tue Apr 2 09:48:24 2024 +0000 - - upstream: Remove unused ptr[3] char array in pkcs11_decode_hex. - - OK deraadt@ - - OpenBSD-Commit-ID: 3d14433e39fd558f662d3b0431c4c555ef920481 - -commit c7fec708f331f108343d69e4d74c9a5d86d6cfe7 -Author: deraadt@openbsd.org -Date: Tue Apr 2 09:32:28 2024 +0000 - - upstream: Replace non-idiomatic strtoul(, 16) to parse a region - - of 2-character hex sequences with a low-level replacement designed just for - the task. ok djm - - OpenBSD-Commit-ID: 67bab8b8a4329a19a0add5085eacd6f4cc215e85 - -commit 019a5f483b0f588da6270ec401d0b4bb35032f3f -Author: deraadt@openbsd.org -Date: Tue Apr 2 09:29:31 2024 +0000 - - upstream: Use strtonum() instead of severely non-idomatic - - strtoul() In particular this will now reject trailing garbage, ie. - '12garbage'. ok djm - - OpenBSD-Commit-ID: c82d95e3ccbfedfc91a8041c2f8bf0cf987d1501 - -commit 8231ca046fa39ea4eb99b79e0a6e09dec50ac952 -Author: deraadt@openbsd.org -Date: Mon Apr 1 15:50:17 2024 +0000 - - upstream: also create a relink kit for ssh-agent, since it is a - - long-running setgid program carrying keys with some (not very powerful) - communication channels. solution for testing the binary from dtucker. - agreement from djm. Will add it into /etc/rc in a few days. - - OpenBSD-Commit-ID: 2fe8d707ae35ba23c7916adcb818bb5b66837ba0 - -commit bf7bf50bd6a14e49c9c243cb8f4de31e555a5a2e -Author: deraadt@openbsd.org -Date: Mon Apr 1 15:48:16 2024 +0000 - - upstream: new-style relink kit for sshd. The old scheme created - - a Makefile by concatenating two Makefiles and was incredibly fragile. In the - new way a narrow-purposed install.sh script is created and shipped with the - objects. A recently commited /etc/rc script understands these files. - - OpenBSD-Commit-ID: ef9341d5a50f0d33e3a6fbe995e92964bc7ef2d3 - -commit 00e63688920905e326d8667cb47f17a156b6dc8f -Author: renmingshuai -Date: Fri Apr 12 10:20:49 2024 +0800 - - Shell syntax fix (leftover from a sync). - - Signed-off-by: renmingshuai - -commit 2eded551ba96e66bc3afbbcc883812c2eac02bd7 -Author: Darren Tucker -Date: Thu Apr 25 13:20:19 2024 +1000 - - Merge flags for OpenSSL 3.x versions. - - OpenSSL has moved to 3.4 which we don't currently accept. Based on - the OpenSSL versioning policy[0] it looks like all of the 3.x versions - should work with OpenSSH, so remove the distinction in configure and - accept all of them. - - [0] https://openssl.org/policies/general/versioning-policy.html - -commit 8673245918081c6d1dc7fb3733c8eb2c5a902c5e -Author: Darren Tucker -Date: Thu Apr 25 13:19:03 2024 +1000 - - Remove 9.6 branch from status page. - -commit 70d43049747fa3c66cf876d52271859407cec2fa -Author: Darren Tucker -Date: Thu Apr 25 13:16:58 2024 +1000 - - Update LibreSSL and OpenSSL versions tested. - - Update LibreSSL versions to current releases (3.8.4 & 3.9.1). - Add newly-released OpenSSL 3.3.0, and add tests against the 3.1 and - 3.3 branches. - -commit bd7ad03050adda455aa13e0a89aa4fd1627fe265 -Merge: 6112792c6 956957e7d -Author: Chris Rapier -Date: Wed Apr 24 17:03:22 2024 -0400 - - Merge pull request #81 from rapier1/dev_minor - - Update to 18.4.1 - -commit 956957e7df3c11175807936c4e56de008c677b84 -Author: Chris Rapier -Date: Mon Apr 22 15:48:26 2024 -0400 - - Crank version number. Remove BufferLimit option. - - The HPNBufferLimit option was intended to clamp the inbound - flow control buffer to half of the available window. Unfortunately, - it looks like it's been broken for some time with a tendancy - to reduce the window to zero and cut the connection. - - As this option was specifically to deal with one special case and - it's broken, fixing it doesn't seem like the right thing to do. - -commit 535def6f0f24aa016b31931a24fbdb96d96b418e -Author: Chris Rapier -Date: Sat Apr 20 18:36:44 2024 -0400 - - Typo in assigning buffer type via sshbuf_type(). - - I was passing a string instead of the int from - the enum. - This version also tries to start the oss-fuzz - integration. - -commit 879ba8a9f497619772bd2e7e097ee3661f99af7b -Merge: bef6104dc 33398dba9 -Author: Chris Rapier -Date: Sat Apr 20 10:28:32 2024 -0400 - - Merge branch 'dev_minor' into oss_fuzz_tests - -commit 33398dba971155dff44f22fe93ca3181ebf423ef -Author: Chris Rapier -Date: Sat Apr 20 10:24:28 2024 -0400 - - Cleanup of patch updated comments. - - Removed references to items that are no longer implemented. - Removed the timestamp element of the sshbuf struct. - Removed time_diff from sshbuf.c as that used the buffer - time stamp. - -commit e8fd3de11bb83350796501eb040586e5d99425cc -Author: Chris Rapier -Date: Fri Apr 19 16:05:16 2024 -0400 - - Whitespace cleanup - -commit 41c3036ee4d519e309d6eb7b138460e52267cae6 -Author: Chris Rapier -Date: Fri Apr 19 14:38:54 2024 -0400 - - Provide headroom for channel input buffer. - - /* we need to reserve a small amount of overhead on the input buffer - * or we can enter into a pathological state during bulk - * data transfers. We use a fraction of the max size as we want it to scale - * with the size of the input buffer. If we do it for all of the buffers - * we fail the regression unit tests. This seems like a reasonable - * solution. Of course, I still need to figure out *why* this is - * happening and come up with an actual fix. TODO - * cjr 4/19/2024 */ - -commit edb2beaae7851b429639af0b491753127ee68469 -Author: Chris Rapier -Date: Thu Apr 18 17:18:27 2024 -0400 - - Rebuilt sshbuf.c from 9.7p1 - - I realized that the existing sshbuf.c might have had - multiple conflicting attempts to fix issues found in - previous versions. So I started from the original sshbuf.c - and added the accelerated buffer growth back into it. This - seems to work in that it's not trying to grow past the - maximum buffer size and it's passing the regression tests. - -commit 345a450a240c1b59a3253a49d74bff0a3a07d960 -Author: Chris Rapier -Date: Thu Apr 18 14:39:58 2024 -0400 - - Checkpoint - -commit 56536761ba1396f53c0b01fb5bea8c4683d11dd9 -Author: Chris Rapier -Date: Thu Apr 18 12:59:36 2024 -0400 - - Add enum for buffer types. - - This patch extends the sshbuf struct by adding a - type field (int). This field is populated by entries - from the sshbuf_types enum. This is set via the sshbuf_type() - function. This type field is used in sshbuff_allocate to - determine if a buffer (channel input and output) need to be - grown to support auto-tuning. - -commit a591fcc62d9ff7570852132464d4830979295065 -Author: Chris Rapier -Date: Wed Apr 17 17:45:43 2024 -0400 - - Attempt to resolve outbuffer growing past maximum size. - - Three primary changes: - 1) Reduce SSHBUF_MAX_SIZE to 128MB. This may - impact performance so it's subject to change. - 2) Only grow the channel input and channel output buffers - in sshbuf_allocate. Right now I'm doing a string match on - the labels. If this ends up being something we'll use - long term we'll want to make the labels an enum for faster - comparisons. - 3) In sshbuf_check_reserve we are no longer checking - aganst max_size/2 - len <= size - offset but against - max_size - len. This seems to prevent the output buffer - from thowing SSH_ERR_NO_BUFFER_SPACE. - - This has not been fully tested and may not be the right solution. - -commit bef6104dcbafa2f0315c5504c1078b85af001a01 -Merge: e7e5e9cdd b2008da46 -Author: Chris Rapier -Date: Thu Apr 11 13:51:13 2024 -0400 - - Merge branch 'oss_fuzz_tests' of github.com:rapier1/hpn-ssh into oss_fuzz_tests - -commit b2008da4654cc0cd25f2a063cecab96a18332cdc -Author: Chris Rapier -Date: Thu Apr 11 13:44:30 2024 -0400 - - Revert "Temp checkpoint." - - This reverts commit 9abcc4e7e0d1473e5b775710d8dbe5f21ff83797. - -commit 62d64cd07e1ec5a1062dcc28b78db9ed4430f009 -Author: Chris Rapier -Date: Thu Apr 11 13:44:02 2024 -0400 - - Revert "Temp checkpoint." - - This reverts commit 3db1f6e2494119482fe295e76120ee4226f4810b. - -commit e7e5e9cdd511b5c70a23bd1adb125f9d9f7206d2 -Author: Chris Rapier -Date: Thu Apr 11 13:42:55 2024 -0400 - - Configure.ac tests to allow OpenSSL 3.4 - - This change explicitly allows the use of OpenSSL 3.4. - Configure.ac has a switch statement that depends on the - reported version of OpenSSL. We need to update these tests - for each point release of OpenSSL. - -commit 4aa6f04fb329dc04d8212ffc3f310d7966f8b7e9 -Merge: 1cfdd6596 6112792c6 -Author: Chris Rapier -Date: Wed Apr 10 15:56:11 2024 -0400 - - Merge pull request #75 from rapier1/release_candidates - - Merge release candidate for 18.4.0 into master - -commit 9abcc4e7e0d1473e5b775710d8dbe5f21ff83797 -Author: Chris Rapier -Date: Tue Apr 9 17:16:21 2024 -0400 - - Temp checkpoint. - - Trying to assign nulls to values in ssh-dss.c ssh_dss_equal. - -commit 3db1f6e2494119482fe295e76120ee4226f4810b -Author: Chris Rapier -Date: Tue Apr 9 17:12:44 2024 -0400 - - Temp checkpoint. - - Trying to assign nulls to values in ssh-rsa.c ssh_rsa_equal. - -commit 79b66e91a470e5011933c9ba0d45460c73501a31 -Author: Chris Rapier -Date: Tue Apr 9 16:52:54 2024 -0400 - - Fix a minor memory leak in kex.c. - - We need to ensure that cc20-mt and cc20-serial are in the - kex proposal string. However, the prior method created a small memory - leak. This patch resolves that leak. Passes regression and fuzz testing. - -commit 88351eca17dcc55189991ba60e50819b6d4193c1 -Author: 90 -Date: Fri Apr 5 19:36:06 2024 +0100 - - Fix missing header for systemd notification - -commit 08f579231cd38a1c657aaa6ddeb8ab57a1fd4f5c -Author: Damien Miller -Date: Wed Apr 3 14:40:32 2024 +1100 - - notify systemd on listen and reload - - Standalone implementation that does not depend on libsystemd. - With assistance from Luca Boccassi, and feedback/testing from Colin - Watson. bz2641 - -commit 43e7c1c07cf6aae7f4394ca8ae91a3efc46514e2 -Author: Darren Tucker -Date: Sun Mar 31 21:51:57 2024 +1100 - - Port changes from selfhosted to upstream tests. - - Should get them working again. - -commit 281ea25a44bff53eefb4af7bab7aa670b1f8b6b2 -Author: Darren Tucker -Date: Sat Mar 30 18:20:16 2024 +1100 - - Check if OpenSSL implementation supports DSA. - - If --enable/disable-dsa-keys is not specified, set based on what OpenSSL - supports. If specified as enabled, but not supported by OpenSSL error - out. ok djm@ - -commit 2d2c068de8d696fe3246f390b146197f51ea1e83 -Author: djm@openbsd.org -Date: Sat Mar 30 05:56:22 2024 +0000 - - upstream: in OpenSSH private key format, correct type for subsequent - - private keys in blob. From Jakub Jelen via GHPR430 - - OpenBSD-Commit-ID: d17dbf47554de2d752061592f95b5d772baab50b - -commit c2c0bdd3e96b3ef66d77fccb85ff4962dc76caf0 -Author: Eero Häkkinen -Date: Sat Sep 16 00:55:08 2023 +0300 - - Expose SSH_AUTH_INFO_0 always to PAM auth modules. - - This changes SSH_AUTH_INFO_0 to be exposed to PAM auth modules also - when a password authentication method is in use and not only - when a keyboard-interactive authentication method is in use. - -commit 02c5ad23124ae801cf248d99ea5068fc4331ca01 -Author: Darren Tucker -Date: Wed Mar 27 17:42:58 2024 +1100 - - Rearrange selfhosted VM scheduling. - - Instead of trying to infer the type of the self hosted tests in each of - the driver scripts (inconsistently...), set one of the following - variables to "true" in the workflow: - - VM: tests run in a virtual machine. - EPHEMERAL: tests run on an ephemeral virtual machine. - PERSISTENT: tests run on a persistent virtual machine - REMOTE: tests run on a physical remote host. - - EPHEMERAL VMs can have multiple instances of any given VM can exist - simultaneously and are run by a runner pool. The other types have a - dedicated runner instance and can only run a single test at a time. - - Other settings: - SSHFS: We need to sshfs mount over the repo so the workflow can collect - build artifacts. This also implies the tests must be run over ssh. - DEBUG_ACTIONS: enable "set -x" in scripts for debugging. - -commit cd8a72707c02615365d0851ac51063ab6bfe258f -Author: Damien Miller -Date: Sat Mar 30 16:05:59 2024 +1100 - - add new token-based signing key for dtucker@ - - Verified in person and via signature with old key. - Will remove old key in a bit. - -commit 8d0e46c1ddb5b7f0992591b0dc5d8aaa77cc9dba -Author: Alkaid -Date: Tue Mar 12 03:59:12 2024 -0700 - - Fix OpenSSL ED25519 support detection - - Wrong function signature in configure.ac prevents openssh from enabling - the recently new support for ED25519 priv keys in PEM PKCS8 format. - -commit 697359be9c23ee43618243cdbcc9c7981e766752 -Author: djm@openbsd.org -Date: Sat Mar 30 04:27:44 2024 +0000 - - upstream: allow WAYLAND_DISPLAY to enable SSH_ASKPASS - - From dkg via GHPR479; ok dtucker@ - - OpenBSD-Commit-ID: 1ac1f9c45da44eabbae89375393c662349239257 - -commit 7844705b0364574cc70b941be72036c2c2966363 -Author: dtucker@openbsd.org -Date: Fri Mar 29 10:40:07 2024 +0000 - - upstream: Use egrep instead of grep -E. - - Some plaforms don't have the latter so this makes things easier - in -portable. - - OpenBSD-Regress-ID: ff82260eb0db1f11130200b25d820cf73753bbe3 - -commit 22b2b6c555334bffdf357a2e4aa74308b03b83c3 -Author: dtucker@openbsd.org -Date: Tue Mar 26 08:09:16 2024 +0000 - - upstream: test -h is the POSIXly way of testing for a symlink. Reduces - - diff vs Portable. - - OpenBSD-Regress-ID: 6f31cd6e231e3b8c5c2ca0307573ccb7484bff7d - -commit 6112792c60c5d360cc21d8ecfbdbe6638bbba748 -Merge: 2a3392d66 9d2f53750 -Author: Mitchell Dorrell -Date: Thu Mar 28 10:51:28 2024 -0400 - - Merge pull request #69 from rapier1/dev_minor - - Dev minor - -commit edcff77f82c2bb2b5653b36f1e47274c5ef3e8be -Author: Darren Tucker -Date: Tue Mar 26 18:58:58 2024 +1100 - - Fix name of OpenBSD upstream CI jobs. - -commit 861b084429940e024f1b6e9c2779eac95d7a45db -Author: Darren Tucker -Date: Tue Mar 26 18:55:33 2024 +1100 - - Resync with upstream: ${} around DATAFILE. - -commit 63f248c7693e7f0a3b9a13d2980ac9a7e37f2aea -Author: djm@openbsd.org -Date: Mon Mar 25 19:28:09 2024 +0000 - - upstream: optional debugging - - OpenBSD-Regress-ID: b4852bf97ac8fb2e3530f2d5f999edd66058d7bc - -commit 16e2ebe06a62f09d4877b769876d92d6008a896f -Author: dtucker@openbsd.org -Date: Mon Mar 25 06:05:42 2024 +0000 - - upstream: Verify string returned from local shell command. - - OpenBSD-Regress-ID: 5039bde24d33d809aebfa8d3ad7fe9053224e6f8 - -commit b326f7a1f39ff31324cc3fe2735178fb474c04a4 -Author: dtucker@openbsd.org -Date: Mon Mar 25 03:30:31 2024 +0000 - - upstream: Improve shell portability: grep -q is not portable so - - redirect stdout, and use printf instead of relying on echo to do \n - substitution. Reduces diff vs Portable. - - Also resync somewhat with upstream. - - OpenBSD-Regress-ID: 9ae876a8ec4c4725f1e9820a0667360ee2398337 - -commit dbf2e319f0c582613fa45a735ea3c242ce56946b -Author: dtucker@openbsd.org -Date: Mon Mar 25 02:07:08 2024 +0000 - - upstream: Save error code from SSH for use inside case statement, - - from portable. In some shells, "case" will reset the value of $?, so save it - first. - - OpenBSD-Regress-ID: da32e5be19299cb4f0f7de7f29c11257a62d6949 - -commit d2c8c4fa7def4fb057ed05b3db57b62c810a26f6 -Author: dtucker@openbsd.org -Date: Mon Mar 25 01:40:47 2024 +0000 - - upstream: Increase timeout. Resyncs with portable where some of - - the test VMs are slow enough for this to matter. - - OpenBSD-Regress-ID: 6a83a693602eb0312f06a4ad2cd6f40d99d24b26 - -commit 83621b63514a84791623db3efb59d38bc4bf9563 -Author: dtucker@openbsd.org -Date: Mon Mar 25 01:28:29 2024 +0000 - - upstream: In PuTTY interop test, don't assume the PuTTY major - - version is 0. Patch from cjwatson at debian.org via bz#3671. - - OpenBSD-Regress-ID: 835ed03c1b04ad46be82e674495521f11b840191 - -commit 8a421b927700f3834b4d985778e252b8e3299f83 -Author: Darren Tucker -Date: Tue Mar 26 18:38:14 2024 +1100 - - Really mkdir /usr/local/etc in CI tests. - -commit 2946ed522c47ce045314533d426b4e379f745e59 -Author: Darren Tucker -Date: Tue Mar 26 17:19:09 2024 +1100 - - Better short name for OpenBSD upstream CI jobs too. - -commit 18dbe8eff647aacb82d7e86b4ce63d5beee11f25 -Author: Darren Tucker -Date: Tue Mar 26 17:13:52 2024 +1100 - - Ensure /usr/local/etc exists before using in tests. - -commit 5fc1085128e3348bb1b5ee4d955cc767b019b3ad -Author: Darren Tucker -Date: Tue Mar 26 16:50:46 2024 +1100 - - Be more specific about when to rerun workflows. - -commit 5516923e8ae3da0823fea0d7d28aa813627142c0 -Author: Darren Tucker -Date: Tue Mar 26 16:35:27 2024 +1100 - - Add short names for test jobs on github CI. - -commit dc37d2d2470b4a9cedcee9ac926b7362214e3305 -Author: Darren Tucker -Date: Tue Mar 26 16:26:14 2024 +1100 - - If we're using xpg4's id, remember to pass args. - -commit fe169487937780392b23d3ff3c00e5898c10f784 -Author: dtucker@openbsd.org -Date: Tue Mar 26 01:23:11 2024 +0000 - - upstream: Import regenerated moduli. - - OpenBSD-Commit-ID: ad3d1486d105b008c93e952d158e5af4d9d4c531 - -commit 151146f03b490d19145cd421763aa7d42f5c50e2 -Author: job@openbsd.org -Date: Thu Mar 14 06:23:14 2024 +0000 - - upstream: Clarify how literal IPv6 addresses can be used in -J mode - - OK djm@ - - OpenBSD-Commit-ID: 524ddae97746b3563ad4a887dfd0a6e6ba114c50 - -commit 0d5bdc87a675271862b67eb6a9fb13a202fb4894 -Author: Darren Tucker -Date: Mon Mar 25 16:14:21 2024 +1100 - - Add Mac OS X 14 test targets. - -commit 2d7964a03e1f50a48040ec6912c0a956df909d21 -Author: Darren Tucker -Date: Mon Mar 25 14:05:40 2024 +1100 - - Move xpg4 'id' handling into test-exec.sh. - - Handle replacement of 'id' the same way as we do other Portable specific - replacements in test-exec.sh. This brings percent.sh back into sync - with upstream. - -commit 75d1d49ed10d978171cdafad28bdbffdbd48f41e -Author: Darren Tucker -Date: Mon Mar 25 10:38:03 2024 +1100 - - Update branches shown on ci-status to 9.7 and 9.6. - -commit f9193f03db0029fc9c31fbdb5c66a2737446bd8f -Author: Darren Tucker -Date: Mon Mar 25 09:28:02 2024 +1100 - - Improve detection of -fzero-call-used-regs=used. - - Should better detect problems with gcc 13 on m68k. bz#3673 from Colin - Watson via bz#3673 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 - - Signed-off-by: Darren Tucker - -commit 9d2f537502244f9cae079f219617cb078464998f -Merge: 196110f94 41ebf6efa -Author: Chris Rapier -Date: Thu Mar 14 16:05:35 2024 -0400 - - Merge branch 'dev_minor' of github.com:rapier1/hpn-ssh into dev_minor - -commit 196110f94342e0567615d46bcc95c20675b503a1 -Author: Chris Rapier -Date: Thu Mar 14 16:05:01 2024 -0400 - - Documentation update for FallbackPort switch and to explicitly state that - hpnssh uses port 2222 as the default port. - Files touched: hpnssh.1 hpnssh_config.5 - -commit 41ebf6efa76627e471327050955eb7ffeab82e67 -Author: Chris Rapier -Date: Tue Mar 12 16:04:54 2024 -0400 - - I seem to have forgotten to actually remove the C89 test so this - should fix that oversight. - -commit 90127cd94fff6e4ecc7c9780d036eaf0bddb451f -Author: Chris Rapier -Date: Tue Mar 12 16:00:34 2024 -0400 - - binn.[c|h] are no lnoger C89 compliant so we are removing the C89 test from the - CI workflow. I don't think this will be a major issue with our projected audience. - Additionally, in binn.c instances of BOOL value; needed to be defined or the - -Werror tests failed. Likewise, I need to move the position of a /*fall through*/ in binn.c - -commit 44937cd3ff4512edad1fe6cb4a822696618598ad -Author: Chris Rapier -Date: Tue Mar 12 14:23:24 2024 -0400 - - Neglected to apply two fixes from another branches. - 1) Updated binn.c and binn.h to the latest versions - 2) Removed unnecessary double dereferencing from metrics.[c|h] - -commit ebcdb90815d964073c0a6e275f5623fb2f0c27ea -Author: Chris Rapier -Date: Mon Mar 11 15:41:53 2024 -0400 - - Working merge of OpenSSH 9.7 into HPN-SSH. This is tentatively - marked as HPN-SSH 18.4.0. Minimal changes were required. The only notable - changes are in regression tests to deal with compatibility tests and what - seems to be typo in the OpenSSH source Makefile for the regression tests. These - changes are to resolve issues with compatibility tests and when building - without openssl libraries. - -commit 065e63da4d9feef303bd5a6da04b64e1bcf6c7a0 -Merge: 1cfdd6596 86bdd3853 -Author: Chris Rapier -Date: Mon Mar 11 15:37:53 2024 -0400 - - This is a staging commit for merging HPN-SSH to OpenSSH 9.7 - This commit should not be used as it contains unresolved - merge conflicts. - -commit 86bdd3853f4d32c85e295e6216a2fe0953ad93f0 -Author: Damien Miller -Date: Mon Mar 11 16:20:49 2024 +1100 - - version number in README - -commit 282721418e6465bc39ccfd39bb0133e670ee4423 -Author: Damien Miller -Date: Mon Mar 11 16:20:08 2024 +1100 - - crank RPM spec versions - -commit 3876a3bbd2ca84d23ba20f8b69ba83270c04ce3a -Author: djm@openbsd.org -Date: Mon Mar 11 04:59:47 2024 +0000 - - upstream: openssh-9.7 - - OpenBSD-Commit-ID: 618ececf58b8cdae016b149787af06240f7b0cbc - -commit 8fc109cc614954a8eb2738c48c0db36a62af9a06 -Author: Darren Tucker -Date: Mon Mar 11 12:59:26 2024 +1100 - - Test against current OpenSSL and LibreSSL releases. - - Add LibreSSL 3.9.0, bump older branches to their respective current - releases. - -commit 26b09b45fec7b88ba09042c09be4157e58e231e2 -Author: Damien Miller -Date: Sun Mar 10 16:24:57 2024 +1100 - - quote regexes used to test for algorithm support - - Fixes test failures on Solaris 8 reported by Tom G. Christensen - -commit a6a740a4948d10a622b505135bb485c10f21db5e -Author: djm@openbsd.org -Date: Sat Mar 9 05:12:13 2024 +0000 - - upstream: avoid logging in signal handler by converting mainloop to - - ppoll() bz3670, reported by Ben Hamilton; ok dtucker@ - - OpenBSD-Commit-ID: e58f18042b86425405ca09e6e9d7dfa1df9f5f7f - -commit cd82f7526e0481720567ae41db7849ab1c27e27b -Author: djm@openbsd.org -Date: Fri Mar 8 22:16:32 2024 +0000 - - upstream: skip more whitespace, fixes find-principals on - - allowed_signers files with blank lines; reported by Wiktor Kwapisiewicz - - OpenBSD-Commit-ID: b3a22a2afd753d70766f34bc7f309c03706b5298 - -commit 2f9d2af5cb19905d87f37d1e11c9f035ac5daf3b -Author: dtucker@openbsd.org -Date: Fri Mar 8 11:34:10 2024 +0000 - - upstream: Invoke ProxyCommand that uses stderr redirection via - - $TEST_SHELL. Fixes test when run by a user whose login shell is tcsh. - Found by vinschen at redhat.com. - - OpenBSD-Regress-ID: f68d79e7f00caa8d216ebe00ee5f0adbb944062a - -commit 9b3f0beb4007a7e01dfedabb429097fb593deae6 -Author: Darren Tucker -Date: Thu Mar 7 17:18:14 2024 +1100 - - Prefer openssl binary from --with-ssl-dir directory. - - Use openssl in the directory specified by --with-ssl-dir as long - as it's functional. Reported by The Doctor. - -commit c47e1c9c7911f38b2fc2fb01b1f6ae3a3121a838 -Author: djm@openbsd.org -Date: Wed Mar 6 02:59:59 2024 +0000 - - upstream: fix memory leak in mux proxy mode when requesting forwarding. - - found by RASU JSC, reported by Maks Mishin in GHPR#467 - - OpenBSD-Commit-ID: 97d96a166b1ad4b8d229864a553e3e56d3116860 - -commit 242742827fea4508e68097c128e802edc79addb5 -Author: djm@openbsd.org -Date: Wed Mar 6 00:31:04 2024 +0000 - - upstream: wrap a few PKCS#11-specific bits in ENABLE_PKCS11 - - OpenBSD-Commit-ID: 463e4a69eef3426a43a2b922c4e7b2011885d923 - -commit d52b6509210e2043f33e5a1de58dd4a0d5d48c2a -Author: Damien Miller -Date: Wed Mar 6 11:31:36 2024 +1100 - - disable RSA tests when algorithm is not supported - - Unbreaks "make test" when compiled --without-openssl. - - Similar treatment to how we do DSA and ECDSA. - -commit 668d270a6c77e8b5a1da26ecad2e6de9f62c8fe4 -Author: Damien Miller -Date: Wed Mar 6 10:33:20 2024 +1100 - - add a --without-retpoline configure option - - discussed with deraadt and dtucker a while ago - -commit 3deb501f86fc47e175ef6a3eaba9b9846a80d444 -Author: djm@openbsd.org -Date: Mon Mar 4 04:13:18 2024 +0000 - - upstream: fix leak of CanonicalizePermittedCNAMEs on error path; - - spotted by Coverity (CID 438039) - - OpenBSD-Commit-ID: 208839699939721f452a4418afc028a9f9d3d8af - -commit 65a44a8a4f7d902a64d4e60eda84384b2e2a24a2 -Author: djm@openbsd.org -Date: Mon Mar 4 02:16:11 2024 +0000 - - upstream: Separate parsing of string array options from applying them - - to the active configuration. This fixes the config parser from erroneously - rejecting cases like: - - AuthenticationMethods password - Match User ivy - AuthenticationMethods any - - bz3657 ok markus@ - - OpenBSD-Commit-ID: 7f196cba634c2a3dba115f3fac3c4635a2199491 - -commit 1cfdd65960413d21db4381f5fbda183acb880f47 -Merge: 5ada7a096 34637c053 -Author: Mitchell Dorrell -Date: Thu Feb 22 15:51:30 2024 -0500 - - Merge pull request #67 from rapier1/bug-128bit-xor - - crank subversion - -commit 34637c05332764d3a3800bb5d41e1fff9c325e1d -Author: Chris Rapier -Date: Thu Feb 22 15:48:29 2024 -0500 - - crank subversion - -commit 5ada7a09609aad746b6cfbc1d8544dba0f9c3778 -Merge: 2a3392d66 ca7744e47 -Author: Mitchell Dorrell -Date: Thu Feb 22 15:36:16 2024 -0500 - - Merge pull request #66 from rapier1/bug-128bit-xor - - Temporary bug fix for 128bit xors in AES-CTR-MT. - -commit ca7744e47518eec9b995f484d3e6e4a1de4f446c -Author: Chris Rapier -Date: Thu Feb 22 15:31:58 2024 -0500 - - Temporary bug fix for 128bit xors in AES-CTR-MT. Not sure of the - cause but it's happening under GCC13 and not GCC12 or GCC11 so - we are thinking something has changed there. This shouldn't impact - performance all that much. - -commit 6886e1b1f55c90942e4e6deed930f8ac32e0f938 -Author: Darren Tucker -Date: Thu Feb 22 17:59:35 2024 +1100 - - Add nbsd10 test target. - -commit d86bf8a3f6ea4fa7887406c2aa9959db71fa41be -Author: Damien Miller -Date: Thu Feb 22 12:06:10 2024 +1100 - - more descriptive configure test name - -commit 9ee335aacc9f5bdc4cc2c19fafb45e27be7d234e -Author: djm@openbsd.org -Date: Wed Feb 21 06:17:29 2024 +0000 - - upstream: explain arguments of internal-sftp GHPR#454 from Niklas - - Hambüchen - MIME-Version: 1.0 - Content-Type: text/plain; charset=UTF-8 - Content-Transfer-Encoding: 8bit - - OpenBSD-Commit-ID: 0335d641ae6b5b6201b9ffd5dd06345ebbd0a3f3 - -commit d1164cb1001dd208fee88aaa9b43d5e6fd917274 -Author: djm@openbsd.org -Date: Wed Feb 21 06:06:43 2024 +0000 - - upstream: clarify permissions requirements for ChrootDirectory Part - - of GHPR#454 from Niklas Hambüchen - MIME-Version: 1.0 - Content-Type: text/plain; charset=UTF-8 - Content-Transfer-Encoding: 8bit - - OpenBSD-Commit-ID: d37bc8786317a11649c62ff5e2936441186ef7a0 - -commit d410e17d186552d0717f18217d0d049486754365 -Author: djm@openbsd.org -Date: Wed Feb 21 06:05:06 2024 +0000 - - upstream: .Cm for a keyword. Part of GHPR#454 from Niklas Hambüchen - - OpenBSD-Commit-ID: d59c52559f926fa82859035d79749fbb4a3ce18a - -commit ab73f9678ebf06b32d6361b88b50b42775e0565b -Author: djm@openbsd.org -Date: Wed Feb 21 06:01:13 2024 +0000 - - upstream: fix typo in match directive predicate (s/tagged/tag) GHPR#462 - - from Tobias Manske - - OpenBSD-Commit-ID: 05b23b772677d48aa82eefd7ebebd369ae758908 - -commit 9844aa2521ccfb1a2d73745680327b79e0574445 -Author: djm@openbsd.org -Date: Wed Feb 21 05:57:34 2024 +0000 - - upstream: fix proxy multiplexing mode, broken when keystroke timing - - obfuscation was added. GHPR#463 from montag451 - - OpenBSD-Commit-ID: 4e412d59b3f557d431f1d81c715a3bc0491cc677 - -commit ee6d932acb532f80b11bb7cf161668c70ec8a117 -Author: djm@openbsd.org -Date: Tue Feb 20 04:10:03 2024 +0000 - - upstream: don't append a gratuitous space to the end of subsystem - - arguments; bz3667 - - OpenBSD-Commit-ID: e11023aeb3f30b77a674e37b8292c862926d5dc6 - -commit e27f032aa8fcbae9b2e7c451baaf4b8ac6fa3d45 -Author: dtucker@openbsd.org -Date: Mon Feb 19 09:25:52 2024 +0000 - - upstream: Always define puttysetup function. - - OpenBSD-Regress-ID: b4c0ccfa4006a1bc5dfd99ccf21c854d3ce2aee0 - -commit 84046f9991abef5f46b040b10cf3d494f933a17b -Author: dtucker@openbsd.org -Date: Fri Feb 9 08:56:59 2024 +0000 - - upstream: Exapnd PuTTY test coverage. - - Expand the set of ciphers, MACs and KEX methods in the PuTTY interop - tests. - - OpenBSD-Regress-ID: dd28d97d48efe7329a396d0d505ee2907bf7fc57 - -commit bbf541ee2afe07b08a8b56fa0dc6f38fcfceef2a -Author: dtucker@openbsd.org -Date: Fri Feb 9 08:47:42 2024 +0000 - - upstream: Factor out PuTTY setup. - - Factor out PuTTY and call only when needed. - - This allows us to avoid PuTTY key setup when it's not needed, which - speeds up the overall test run by a couple of percent. - - OpenBSD-Regress-ID: c25eaccc3c91bc874400f7c85ce40e9032358c1c - -commit d31c21c57fb4245271680a1e5043cf6470a96766 -Author: naddy@openbsd.org -Date: Sat Feb 10 11:28:52 2024 +0000 - - upstream: clean sshd random relinking kit; ok miod@ - - OpenBSD-Commit-ID: 509bb19bb9762a4b3b589af98bac2e730541b6d4 - -commit 4dbc5a363ff53a2fcecf6bc3bcc038badc12f118 -Author: djm@openbsd.org -Date: Fri Feb 2 00:13:34 2024 +0000 - - upstream: whitespace - - OpenBSD-Commit-ID: b24680bc755b621ea801ff8edf6f0f02b68edae1 - -commit efde85dda2130272af24cc346f6c3cd326182ff1 -Author: Darren Tucker -Date: Mon Feb 19 17:29:31 2024 +1100 - - Improve error message for OpenSSL header check. - - bz#3668, ok djm@ - -commit cbbdf868bce431a59e2fa36ca244d5739429408d -Author: Darren Tucker -Date: Wed Feb 7 13:45:02 2024 +1100 - - Interop test against PuTTY snapshot and releases. - -commit 91898bf786b0f149f962c4c96c08a46f29888c10 -Author: Darren Tucker -Date: Tue Feb 6 16:21:05 2024 +1100 - - Put privsep dir on OS X on /usr/local. - - On some runners we can't create /var/empty, so put it some place we can - write. Should fix test breakage on Max OS X 11. - -commit be5ed8ebed8388c5056bfde4688308cc873c18b9 -Author: Darren Tucker -Date: Tue Feb 6 11:19:42 2024 +1100 - - Add --disable-fd-passing option. - - .. and enable for the minix3 test VM. This will cause it to more reliably - skip tests that need FD passing and should fix the current test breakage. - -commit 0f6a8a0d0a518fd78c4cbebfdac990a57a1c4e41 -Author: Darren Tucker -Date: Tue Feb 6 11:18:44 2024 +1100 - - Use "skip" function instead doing it ourselves. - -commit 2a3392d668c8722bb23cbb58ca7d9edcaa8fa8b5 -Author: Chris Rapier -Date: Fri Feb 2 11:43:45 2024 -0500 - - Trigger CI workflow for release_candidates branch - -commit 4bb06c850f2e0b2caa5a6db247bd391c9b6a42d6 -Merge: 1be8f2bbc c398f2758 -Author: Mitchell Dorrell -Date: Fri Feb 2 11:12:51 2024 -0500 - - Merge pull request #64 from rapier1/18.3-testing - - Merging 18.3-testing into release_candidates after successful review. - -commit c398f2758bfeec11fc58ca1e05e4c43f98ef0d8b -Author: Chris Rapier -Date: Thu Feb 1 17:27:45 2024 -0500 - - Revert "Trying out using the tcpi_rcv_space value from tcp_info instead of" - - This should not have been pushed to guthub. - - This reverts commit 77aaba167a7fbcad999052f69548d96be04be0f6. - -commit 3ad669f81aabbd2ba9fbd472903f680f598e1e99 -Author: Damien Miller -Date: Thu Feb 1 14:01:18 2024 +1100 - - ignore some vim droppings - -commit c283f29d23611a06bbee06bcf458f2fffad721d9 -Author: djm@openbsd.org -Date: Thu Feb 1 02:37:33 2024 +0000 - - upstream: whitespace - - OpenBSD-Commit-ID: bf9e4a1049562ee4322684fbdce07142f04fdbb7 - -commit 77aaba167a7fbcad999052f69548d96be04be0f6 -Author: Chris Rapier -Date: Wed Jan 31 16:58:13 2024 -0500 - - Trying out using the tcpi_rcv_space value from tcp_info instead of - SO_RCV_BUF as SO_RCV_BUF might end up overbuffering the connection. - -commit 28c8606a9c018cf0c28fab764bfc74872e391a47 -Author: Chris Rapier -Date: Thu Jan 25 16:38:23 2024 -0500 - - There is a situation in SSH -> HPN connection the advertised - window will 16MB and then it will cause some odd behaviour - on the part of the ssh client. Basically it looks like it's - doing a lot of expensive drains and fills on a buffer - that significantly impacts throughput. This is a fix that - annoys me because *any* SSH to HPN connection is now limited - to a maximum recieve window of 15MB. Which is not - optimal in anyway. Still, it's better than the through - put of the pathological state which significantly slower. - -commit 38854e0c754c705faff94a99d912c711c2a29ab7 -Author: Chris Rapier -Date: Thu Jan 25 15:37:20 2024 -0500 - - testing - -commit 218c234943c04a1ea0ab5642842509a25e83ef86 -Author: Chris Rapier -Date: Thu Jan 25 14:16:06 2024 -0500 - - Checkpoint - -commit 1be8f2bbc86ea8b9bf4ba65f48b0fc81023b900e -Merge: 70844a7f5 b357fbc5a -Author: Chris Rapier -Date: Tue Jan 16 13:48:47 2024 -0500 - - Merge pull request #61 from rapier1/dev_minor - - Promote dev_minor to RC for 18.3.0 incorporating OpenSSH 9.6 - -commit b357fbc5af26e69e633d96a9a7cf8cb93ce0b282 -Author: Chris Rapier -Date: Tue Jan 16 13:43:37 2024 -0500 - - Fixing a typo in a comment and seeing - how toi make requested changes in a PR review. - -commit 0d96b1506b2f4757fefa5d1f884d49e96a6fd4c3 -Author: Damien Miller -Date: Tue Jan 16 14:40:18 2024 +1100 - - skip tests that use multiplexing on Windows - - Some tests here use multiplexing, skip these if DISABLE_FD_PASSING - is set. Should unbreak tests on Windows. - -commit 50080fa42f5f744b798ee29400c0710f1b59f50e -Author: djm@openbsd.org -Date: Thu Jan 11 04:50:28 2024 +0000 - - upstream: don't disable RSA test when DSA is disabled; bug introduced - - in last commit - - OpenBSD-Regress-ID: 8780a7250bf742b33010e9336359a1c516f2d7b5 - -commit 415c94ce17288e0cdcb9e58cc91fba78d33c8457 -Author: djm@openbsd.org -Date: Thu Jan 11 01:45:58 2024 +0000 - - upstream: make DSA testing optional, defaulting to on - - ok markus - - OpenBSD-Regress-ID: dfc27b5574e3f19dc4043395594cea5f90b8572a - -commit f9311e8921d92c5efca767227a497ab63280ac39 -Author: djm@openbsd.org -Date: Thu Jan 11 01:51:16 2024 +0000 - - upstream: ensure key_fd is filled when DSA is disabled; spotted by - - tb@ - - OpenBSD-Commit-ID: 9dd417b6eec3cf67e870f147464a8d93f076dce7 - -commit 4e838120a759d187b036036610402cbda33f3203 -Author: djm@openbsd.org -Date: Thu Jan 11 01:45:36 2024 +0000 - - upstream: make DSA key support compile-time optional, defaulting to - - on - - ok markus@ - - OpenBSD-Commit-ID: 4f8e98fc1fd6de399d0921d5b31b3127a03f581d - -commit afcc9028bfc411bc26d20bba803b83f90cb84e26 -Author: jmc@openbsd.org -Date: Wed Jan 10 06:33:13 2024 +0000 - - upstream: fix incorrect capitalisation; - - OpenBSD-Commit-ID: cb07eb06e15fa2334660ac73e98f29b6a1931984 - -commit 7cd06081f05681654675357baaff2f28f26c25da -Author: Chris Rapier -Date: Wed Jan 10 13:08:19 2024 -0500 - - Fixed a non-impactful typo in ssh-add.c. This fix comes from the - mailing list where it was confirmed to be a typo. - -commit 9707c8170c0c1baeb1e06e5a53f604498193885f -Author: djm@openbsd.org -Date: Tue Jan 9 22:19:36 2024 +0000 - - upstream: extend ChannelTimeout regression test to exercise multiplexed - - connections and the new "global" timeout type. ok dtucker@ - - OpenBSD-Regress-ID: f10d19f697024e9941acad7c2057f73d6eacb8a2 - -commit b31b12d28de96e1d43581d32f34da8db27e11c03 -Author: djm@openbsd.org -Date: Tue Jan 9 22:19:00 2024 +0000 - - upstream: add a "global" ChannelTimeout type to ssh(1) and sshd(8) - - that watches all open channels and will close all open channels if there is - no traffic on any of them for the specified interval. This is in addition to - the existing per-channel timeouts added a few releases ago. - - This supports use-cases like having a session + x11 forwarding channel - open where one may be idle for an extended period but the other is - actively used. The global timeout would allow closing both channels when - both have been idle for too long. - - ok dtucker@ - - OpenBSD-Commit-ID: 0054157d24d2eaa5dc1a9a9859afefc13d1d7eb3 - -commit 602f4beeeda5bb0eca181f8753d923a2997d0a51 -Author: djm@openbsd.org -Date: Tue Jan 9 21:39:14 2024 +0000 - - upstream: adapt ssh_api.c code for kex-strict - - from markus@ ok me - - OpenBSD-Commit-ID: 4d9f256852af2a5b882b12cae9447f8f00f933ac - -commit 2c08ebf449be298311d180a98c0e5bb1df3150a4 -Author: Chris Rapier -Date: Tue Jan 9 15:05:22 2024 -0500 - - More portable fix for the qidx issue. - We still don't really understand why it's happening. As long as that init - happens after the pthread_rwlock_rdlock(&aes_mt_ctx->tid_lock); line it's fine. - Tentatively thinking it's a weird compiler optimization problem. Commentted in line - as well. - - Also add a fix (from OpenSSH) to compile failures if there is no EC in - openssl. - -commit a64a047fe071e05d9fda9f2ebee6e98f15ec8306 -Author: Chris Rapier -Date: Tue Jan 9 14:32:35 2024 -0500 - - I was getting a warning/error saying - 'cipher-ctr-mt-functions.c: In function ‘thread_loop’: - cipher-ctr-mt-functions.c:218:13: error: variable ‘qidx’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] - 218 | int qidx; - | ^~~~ - cc1: all warnings being treated as errors - ' - Moving the initialization of qidx from the top of the function - to the for loop declaration resolved this. - -commit 7a5ffb6189872227284dadaddfc3244b039b9511 -Merge: 8241b9c05 134f70287 -Author: Chris Rapier -Date: Mon Jan 8 11:30:15 2024 -0500 - - first pass as merging 9.6 - -commit 42ba34aba8708cf96583ff52975d95a8b47d990d -Author: Damien Miller -Date: Mon Jan 8 16:26:37 2024 +1100 - - nite that recent OSX tun/tap is unsupported - -commit 690bc125f9a3b20e47745fa8f5b5e1fd5820247f -Author: Sevan Janiyan -Date: Wed Dec 27 04:57:49 2023 +0000 - - README.platform: update tuntap url - -commit 6b8be2ccd7dd091808f86af52066b0c2ec30483a -Author: Rose <83477269+AtariDreams@users.noreply.github.com> -Date: Tue Dec 19 11:48:20 2023 -0500 - - Fix compilation error in ssh-pcks11-client.c - - Compilation fails becaus of an undefined reference to helper_by_ec, - because we forgot the preprocessor conditional that excludes that function - from being called in unsupported configurations. - -commit 219c8134157744886ee6ac5b8c1650abcd981f4c -Author: djm@openbsd.org -Date: Mon Jan 8 05:11:18 2024 +0000 - - upstream: Remove outdated note from PROTOCOL.mux - - Port forward close by control master is already implemented - by `mux_master_process_close_fwd` in `mux.c` - - GHPR442 from bigb4ng - - OpenBSD-Commit-ID: ad0734fe5916d2dc7dd02b588906cea4df0482fb - -commit 4c3cf362631ccc4ffd422e572f075d5d594feace -Author: djm@openbsd.org -Date: Mon Jan 8 05:05:15 2024 +0000 - - upstream: fix missing field in users-groups-by-id@openssh.com reply - - documentation - - GHPR441 from TJ Saunders - - OpenBSD-Commit-ID: ff5733ff6ef4cd24e0758ebeed557aa91184c674 - -commit f64cede2a3c298b50a2659a8b53eb3ab2c0b8d23 -Author: djm@openbsd.org -Date: Mon Jan 8 04:10:03 2024 +0000 - - upstream: make kex-strict section more explicit about its intent: - - banning all messages not strictly required in KEX - - OpenBSD-Commit-ID: fc33a2d7f3b7013a7fb7500bdbaa8254ebc88116 - -commit 698fe6fd61cbcb8e3e0e874a561d4335a49fbde5 -Author: Damien Miller -Date: Mon Jan 8 14:46:19 2024 +1100 - - update fuzzer example makefile to clang16 - -commit fc332cb2d602c60983a8ec9f89412754ace06425 -Author: Damien Miller -Date: Mon Jan 8 14:45:49 2024 +1100 - - unbreak fuzzers - missing pkcs11_make_cert() - - provide stub for use in fuzzer harness - -commit 9ea0a4524ae3276546248a926b6641b2fbc8421b -Author: Damien Miller -Date: Mon Jan 8 14:45:14 2024 +1100 - - unbreak fuzzers for clang16 - - getopt() needs a throw() attribute to compile, so supply one when compiling - things with C++ - -commit a72833d00788ef91100c643536ac08ada46440e1 -Author: djm@openbsd.org -Date: Mon Jan 8 00:34:33 2024 +0000 - - upstream: remove ext-info-* in the kex.c code, not in callers; - - with/ok markus@ - - OpenBSD-Commit-ID: c06fe2d3a0605c517ff7d65e38ec7b2d1b0b2799 - -commit 86f9e96d9bcfd1f5cd4bf8fb57a9b4c242df67df -Author: djm@openbsd.org -Date: Mon Jan 8 00:30:39 2024 +0000 - - upstream: fix typo; spotted by Albert Chin - - OpenBSD-Commit-ID: 77140b520a43375b886e535eb8bd842a268f9368 - -commit f0cbd26ec91bd49719fb3eea7ca44d2380318b9a -Author: dtucker@openbsd.org -Date: Thu Jan 4 09:51:49 2024 +0000 - - upstream: Import regenerated moduli. - - OpenBSD-Commit-ID: 5a636f6ca7f25bfe775df4952f7aac90a7fcbbee - -commit 64ddf776531ca4933832beecc8b7ebe1b937e081 -Author: jsg@openbsd.org -Date: Wed Dec 20 00:06:25 2023 +0000 - - upstream: spelling; ok markus@ - - OpenBSD-Commit-ID: 9d01f2e9d59a999d5d42fc3b3efcf8dfb892e31b - -commit 503fbe9ea238a4637e8778208bde8c09bcf78475 -Author: jmc@openbsd.org -Date: Tue Dec 19 06:57:34 2023 +0000 - - upstream: sort -C, and add to usage(); ok djm - - OpenBSD-Commit-ID: 80141b2a5d60c8593e3c65ca3c53c431262c812f - -commit 5413b1c7ff5a19c6a7d44bd98c5a83eb47819ba6 -Author: djm@openbsd.org -Date: Tue Dec 19 06:41:14 2023 +0000 - - upstream: correct section numbers; from Ed Maste - - OpenBSD-Commit-ID: e289576ee5651528404cb2fb68945556052cf83f - -commit 430ef864645cff83a4022f5b050174c840e275da -Author: djm@openbsd.org -Date: Mon Dec 18 15:58:56 2023 +0000 - - upstream: match flag type (s/int/u_int) - - OpenBSD-Commit-ID: 9422289747c35ccb7b31d0e1888ccd5e74ad566a - -commit 1036d77b34a5fa15e56f516b81b9928006848cbd -Author: Damien Miller -Date: Fri Dec 22 17:56:26 2023 +1100 - - better detection of broken -fzero-call-used-regs - - gcc 13.2.0 on ppc64le refuses to compile some function, including - cipher.c:compression_alg_list() with an error: - - > sorry, unimplemented: argument ‘used’ is not supportedcw - > for ‘-fzero-call-used-regs’ on this target - - This extends the autoconf will-it-work test with a similarly- - structured function that seems to catch this. - - Spotted/tested by Colin Watson; bz3645 - -commit 8241b9c0529228b4b86d88b1a6076fb9f97e4a99 -Author: Damien Miller -Date: Tue Dec 19 01:59:50 2023 +1100 - - crank versions - -commit 2f2c65cb5f1518a9c556d3e8efa27ea0ca305c6b -Author: Damien Miller -Date: Tue Dec 19 01:59:06 2023 +1100 - - depend - -commit e48cdee8e19059203b1aeeabec2350b8375fa61f -Author: djm@openbsd.org -Date: Mon Dec 18 14:50:08 2023 +0000 - - upstream: regress test for agent PKCS#11-backed certificates - - OpenBSD-Regress-ID: 38f681777cb944a8cc3bf9d0ad62959a16764df9 - -commit 2f512f862df1d5f456f82a0334c9e8cc7208a2a1 -Author: djm@openbsd.org -Date: Mon Dec 18 14:49:39 2023 +0000 - - upstream: regress test for constrained PKCS#11 keys - - OpenBSD-Regress-ID: b2f26ae95d609d12257b43aef7cd7714c82618ff - -commit cdddd66412ca5920ed4d3ebbfa6ace12dbd9b82f -Author: djm@openbsd.org -Date: Mon Dec 18 14:48:44 2023 +0000 - - upstream: openssh-9.6 - - OpenBSD-Commit-ID: 21759837cf0e0092d9a2079f8fb562071c11016b - -commit 6d51feab157cedf1e7ef5b3f8781ca8ff9c4ab1b -Author: djm@openbsd.org -Date: Mon Dec 18 14:48:08 2023 +0000 - - upstream: ssh-agent: record failed session-bind attempts - - Record failed attempts to session-bind a connection and refuse signing - operations on that connection henceforth. - - Prevents a future situation where we add a new hostkey type that is not - recognised by an older ssh-agent, that consequently causes session-bind - to fail (this situation is only likely to arise when people mix ssh(1) - and ssh-agent(1) of different versions on the same host). Previously, - after such a failure the agent socket would be considered unbound and - not subject to restriction. - - Spotted by Jann Horn - - OpenBSD-Commit-ID: b0fdd023e920aa4831413f640de4c5307b53552e - -commit 7ef3787c84b6b524501211b11a26c742f829af1a -Author: djm@openbsd.org -Date: Mon Dec 18 14:47:44 2023 +0000 - - upstream: ban user/hostnames with most shell metacharacters - - This makes ssh(1) refuse user or host names provided on the - commandline that contain most shell metacharacters. - - Some programs that invoke ssh(1) using untrusted data do not filter - metacharacters in arguments they supply. This could create - interactions with user-specified ProxyCommand and other directives - that allow shell injection attacks to occur. - - It's a mistake to invoke ssh(1) with arbitrary untrusted arguments, - but getting this stuff right can be tricky, so this should prevent - most obvious ways of creating risky situations. It however is not - and cannot be perfect: ssh(1) has no practical way of interpreting - what shell quoting rules are in use and how they interact with the - user's specified ProxyCommand. - - To allow configurations that use strange user or hostnames to - continue to work, this strictness is applied only to names coming - from the commandline. Names specified using User or Hostname - directives in ssh_config(5) are not affected. - - feedback/ok millert@ markus@ dtucker@ deraadt@ - - OpenBSD-Commit-ID: 3b487348b5964f3e77b6b4d3da4c3b439e94b2d9 - -commit 0cb50eefdd29f0fec31d0e71cc4b004a5f704e67 -Author: djm@openbsd.org -Date: Mon Dec 18 14:47:20 2023 +0000 - - upstream: stricter handling of channel window limits - - This makes ssh/sshd more strict in handling non-compliant peers that - send more data than the advertised channel window allows. Previously - the additional data would be silently discarded. This change will - cause ssh/sshd to terminate the connection if the channel window is - exceeded by more than a small grace allowance. - - ok markus@ - - OpenBSD-Commit-ID: 811e21b41831eba3dd7f67b3d409a438f20d3037 - -commit 4448a2938abc76e6bd33ba09b2ec17a216dfb491 -Author: djm@openbsd.org -Date: Mon Dec 18 14:46:56 2023 +0000 - - upstream: Make it possible to load certs from PKCS#11 tokens - - Adds a protocol extension to allow grafting certificates supplied by - ssh-add to keys loaded from PKCS#11 tokens in the agent. - - feedback/ok markus@ - - OpenBSD-Commit-ID: bb5433cd28ede2bc910996eb3c0b53e20f86037f - -commit 881d9c6af9da4257c69c327c4e2f1508b2fa754b -Author: djm@openbsd.org -Date: Mon Dec 18 14:46:12 2023 +0000 - - upstream: apply destination constraints to all p11 keys - - Previously applied only to the first key returned from each token. - - ok markus@ - - OpenBSD-Commit-ID: 36df3afb8eb94eec6b2541f063d0d164ef8b488d - -commit a7ed931caeb68947d30af8a795f4108b6efad761 -Author: djm@openbsd.org -Date: Mon Dec 18 14:45:49 2023 +0000 - - upstream: add "ext-info-in-auth@openssh.com" extension - - This adds another transport protocol extension to allow a sshd to send - SSH2_MSG_EXT_INFO during user authentication, after the server has - learned the username that is being logged in to. - - This lets sshd to update the acceptable signature algoritms for public - key authentication, and allows these to be varied via sshd_config(5) - "Match" directives, which are evaluated after the server learns the - username being authenticated. - - Full details in the PROTOCOL file - - OpenBSD-Commit-ID: 1de7da7f2b6c32a46043d75fcd49b0cbb7db7779 - -commit 1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5 -Author: djm@openbsd.org -Date: Mon Dec 18 14:45:17 2023 +0000 - - upstream: implement "strict key exchange" in ssh and sshd - - This adds a protocol extension to improve the integrity of the SSH - transport protocol, particular in and around the initial key exchange - (KEX) phase. - - Full details of the extension are in the PROTOCOL file. - - with markus@ - - OpenBSD-Commit-ID: 2a66ac962f0a630d7945fee54004ed9e9c439f14 - -commit 59d691b886c79e70b1d1c4ab744e81fd176222fd -Author: Damien Miller -Date: Mon Dec 18 14:49:11 2023 +1100 - - better detection of broken -fzero-call-used-regs - - Use OSSH_CHECK_CFLAG_LINK() for detection of these flags and extend - test program to exercise varargs, which seems to catch more stuff. - - ok dtucker@ - -commit aa7b21708511a6d4aed3839fc9f6e82e849dd4a1 -Author: djm@openbsd.org -Date: Wed Dec 13 03:28:19 2023 +0000 - - upstream: when invoking KnownHostsCommand to determine the order of - - host key algorithms to request, ensure that the hostname passed to the - command is decorated with the port number for ports other than 22. - - This matches the behaviour of KnownHostsCommand when invoked to look - up the actual host key. - - bz3643, ok dtucker@ - - OpenBSD-Commit-ID: 5cfabc0b7c6c7ab473666df314f377b1f15420b1 - -commit 4086bd6652c0badccc020218a62190a7798fb72c -Author: markus@openbsd.org -Date: Fri Dec 8 09:18:39 2023 +0000 - - upstream: prevent leak in sshsig_match_principals; ok djm@ - - OpenBSD-Commit-ID: 594f61ad4819ff5c72dfe99ba666a17f0e1030ae - -commit 19d3ee2f3adf7d9a606ff015c1e153744702c4c9 -Author: djm@openbsd.org -Date: Wed Dec 6 21:06:48 2023 +0000 - - upstream: short circuit debug log processing early if we're not going - - to log anything. From Kobe Housen - - OpenBSD-Commit-ID: 2bcddd695872a1bef137cfff7823044dcded90ea - -commit 134f702876fc9445add7eb646cd199e0db083aec -Author: Chris Rapier -Date: Wed Nov 29 17:47:12 2023 -0500 - - Add github-repo-stats workflow file - -commit 947affad4831df015c498c00c6351ea6f13895d5 -Author: Darren Tucker -Date: Mon Nov 27 09:37:28 2023 +1100 - - Add tests for OpenSSL 3.2.0 and 3.2 stable branch. - -commit 747dce36206675ca6b885010a835733df469351b -Author: Darren Tucker -Date: Sat Nov 25 09:03:38 2023 +1100 - - Use non-zero arg in compiler test program. - - Now that we're running the test program, passing zero to the test function - can cause divide-by-zero exceptions which might show up in logs. - -commit 3d44a5c56585d1c351dbc006240a591b6da502b1 -Author: dtucker@openbsd.org -Date: Fri Nov 24 00:31:30 2023 +0000 - - upstream: Plug mem leak of msg when processing a quit message. - - Coverity CID#427852, ok djm@ - - OpenBSD-Commit-ID: bf85362addbe2134c3d8c4b80f16601fbff823b7 - -commit 1d7f9b6e297877bd00973e6dc5c0642dbefc3b5f -Author: dtucker@openbsd.org -Date: Thu Nov 23 03:37:05 2023 +0000 - - upstream: Include existing mux path in debug message. - - OpenBSD-Commit-ID: 1c3641be10c2f4fbad2a1b088a441d072e18bf16 - -commit f29934066bd0e561a2e516b7e584fb92d2eedee0 -Author: Darren Tucker -Date: Thu Nov 23 19:41:27 2023 +1100 - - Add an Ubuntu 22.04 test VM. - - This is the same version as Github's runners so most of the testing on - it is over there, but having a local VM makes debugging much easier. - -commit a93284a780cd3972afe5f89086b75d564ba157f3 -Author: Darren Tucker -Date: Thu Nov 23 19:36:22 2023 +1100 - - Add gcc-12 -Werror test on Ubuntu 22.04. - - Explictly specify gcc-11 on Ubuntu 22.04 (it's the system compiler). - -commit 670f5a647e98b6fd95ad64f789f87ee3274b481b -Author: Darren Tucker -Date: Thu Nov 23 19:34:57 2023 +1100 - - Check return value from write to prevent warning. - - ... and since we're testing for flags with -Werror, this caused - configure to mis-detect compiler flags. - -commit cea007d691cfedfa07a5b8599f97ce0511f53fc9 -Author: Darren Tucker -Date: Wed Nov 22 21:18:55 2023 +1100 - - Run compiler test program when compiling natively. - - ok djm@ - -commit ee0d305828f13536c0a416bbf9c3e81039d9ea55 -Author: Darren Tucker -Date: Wed Nov 22 21:18:07 2023 +1100 - - Factor out compiler test program into a macro. - - ok djm@ - -commit de304c76316b029df460673725a9104224b9959b -Author: Darren Tucker -Date: Wed Nov 22 08:55:36 2023 +1100 - - Add fbsd14 VM to test pool. - -commit 99a2df5e1994cdcb44ba2187b5f34d0e9190be91 -Author: Darren Tucker -Date: Tue Nov 21 16:19:29 2023 +1100 - - Expand -fzero-call-used-regs test to cover gcc 11. - - It turns out that gcc also has some problems with -fzero-call-used-regs, - at least v11 on mips. Previously the test in OSSH_CHECK_CFLAG_COMPILE - was sufficient to catch it with "=all", but not sufficient for "=used". - Expand the testcase and include it in the other tests for good measure. - See bz#3629. ok djm@. - -commit ff220d4010717f7bfbbc02a2400666fb9d24f250 -Author: Darren Tucker -Date: Tue Nov 21 14:04:34 2023 +1100 - - Stop using -fzero-call-used-regs=all - - ... since it seems to be problematic with several different versions of - clang. Only use -fzero-call-used-regs=used which is less - problematic, except with Apple's clang where we don't use it at all. - bz#3629, ok djm@ - -commit 2a19e02f36b16f0f6cc915f7d1e60ead5e36303b -Author: Darren Tucker -Date: Tue Nov 21 14:02:18 2023 +1100 - - Allow for vendor prefix on clang version numbers. - - Correctly detects the version of OpenBSD's native clang, as well as - Apple's. Spotted tb@, ok djm@. - -commit c52db0114826d73eff6cdbf205e9c1fa4f7ca6c6 -Author: djm@openbsd.org -Date: Mon Nov 20 02:50:00 2023 +0000 - - upstream: set errno=EAFNOSUPPORT when filtering addresses that don't - - match AddressFamily; yields slightly better error message if no address - matches. bz#3526 - - OpenBSD-Commit-ID: 29cea900ddd8b04a4d1968da5c4a893be2ebd9e6 - -commit 26f3f3bbc69196d908cad6558c8c7dc5beb8d74a -Author: djm@openbsd.org -Date: Wed Nov 15 23:03:38 2023 +0000 - - upstream: when connecting via socket (the default case), filter - - addresses by AddressFamily if one was specified. Fixes the case where, if - CanonicalizeHostname is enabled, ssh may ignore AddressFamily. bz5326; ok - dtucker - - OpenBSD-Commit-ID: 6c7d7751f6cd055126b2b268a7b64dcafa447439 - -commit 050c335c8da43741ed0df2570ebfbd5d1dfd0a31 -Author: djm@openbsd.org -Date: Wed Nov 15 22:51:49 2023 +0000 - - upstream: when deciding whether to enable keystroke timing - - obfuscation, only consider enabling it when a channel with a tty is open. - - Avoids turning on the obfucation when X11 forwarding only is in use, - which slows it right down. Reported by Roger Marsh - - OpenBSD-Commit-ID: c292f738db410f729190f92de100c39ec931a4f1 - -commit 676377ce67807a24e08a54cd60ec832946cc6cae -Author: tobhe@openbsd.org -Date: Mon Nov 13 09:18:19 2023 +0000 - - upstream: Make sure sftp_get_limits() only returns 0 if 'limits' - - was initialized. This fixes a potential uninitialized use of 'limits' in - sftp_init() if sftp_get_limits() returned early because of an unexpected - message type. - - ok djm@ - - OpenBSD-Commit-ID: 1c177d7c3becc1d71bc8763eecf61873a1d3884c - -commit 64e0600f23c6dec36c3875392ac95b8a9100c2d6 -Author: Darren Tucker -Date: Mon Nov 13 20:03:31 2023 +1100 - - Test current releases of LibreSSL and OpenSSL. - - Retire some of the older releases. - -commit c8ed7cc545879ac15f6ce428be4b29c35598bb2a -Author: dtucker@openbsd.org -Date: Wed Nov 1 02:08:38 2023 +0000 - - upstream: Specify ssh binary to use - - ... instead of relying on installed one. Fixes test failures in -portable - when running tests prior to installation. - - OpenBSD-Regress-ID: b6d6ba71c23209c616efc805a60d9a445d53a685 - -commit e9fc2c48121cada1b4dcc5dadea5d447fe0093c3 -Author: Darren Tucker -Date: Wed Nov 1 13:11:31 2023 +1100 - - Put long-running test targets on hipri runners. - - Some of the selfhosted test targets take a long time to run for various - reasons, so label them for "libvirt-hipri" runners so that they can - start immediately. This should reduce the time to complete all tests. - -commit 7ddf27668f0e21233f08c0ab2fe9ee3fdd6ab1e2 -Author: djm@openbsd.org -Date: Wed Nov 1 00:29:46 2023 +0000 - - upstream: add some tests of forced commands overriding Subsystem - - directives - - OpenBSD-Regress-ID: eb48610282f6371672bdf2a8b5d2aa33cfbd322b - -commit fb06f9b5a065dfbbef5916fc4accc03c0bf026dd -Author: dtucker@openbsd.org -Date: Tue Oct 31 04:15:40 2023 +0000 - - upstream: Don't try to use sudo inside sshd log wrapper. - - We still need to check if we're using sudo since we don't want to chown - unecessarily, as on some platforms this causes an error which pollutes - stderr. We also don't want to unnecessarily invoke sudo, since it's - running in the context of the proxycommand, on *other* platforms it - may not be able to authenticate, and if we're using SUDO then it should - already be privileged. - - OpenBSD-Regress-ID: 70d58df7503db699de579a9479300e5f3735f4ee - -commit fc3cc33e88c242c704781c6c48087838f1dcfa2a -Author: dtucker@openbsd.org -Date: Tue Oct 31 02:58:45 2023 +0000 - - upstream: Only try to chmod logfile if we have sudo. If we don't have - - sudo then we won't need to chmod. - - OpenBSD-Regress-ID: dbad2f5ece839658ef8af3376cb1fb1cabe2e324 - -commit 3a506598fddd3f18f9095af3fe917f24cbdd32e0 -Author: djm@openbsd.org -Date: Mon Oct 30 23:00:25 2023 +0000 - - upstream: move PKCS#11 setup code to test-exec.sh so it can be reused - - elsewhere - - OpenBSD-Regress-ID: 1d29e6be40f994419795d9e660a8d07f538f0acb - -commit f82fa227a52661c37404a6d33bbabf14fed05db0 -Author: djm@openbsd.org -Date: Mon Oct 30 17:32:00 2023 +0000 - - upstream: tidy and refactor PKCS#11 setup code - - Replace the use of a perl script to delete the controlling TTY with a - SSH_ASKPASS script to directly load the PIN. - - Move PKCS#11 setup code to functions in anticipation of it being used - elsewhere in additional tests. - - Reduce stdout spam - - OpenBSD-Regress-ID: 07705c31de30bab9601a95daf1ee6bef821dd262 - -commit 3cf698c6d4ffa9be1da55672a3519e2135a6366a -Author: Darren Tucker -Date: Mon Oct 30 21:35:03 2023 +1100 - - Add obsd74 test VM and retire obsd69 and obsd70. - -commit 3e21d58a09894acb38dc69ed615d101131f473d0 -Author: Darren Tucker -Date: Mon Oct 30 18:34:12 2023 +1100 - - Add OpenSSL 3.3.0 as a known dev version. - -commit 917ba181c2cbdb250a443589ec732aa36fd51ffa -Author: Darren Tucker -Date: Mon Oct 30 13:32:03 2023 +1100 - - Restore nopasswd sudo rule on Mac OS X. - - This seems to be missing from some (but not all) github runners, so - restore it if it seems to be missing. - -commit c5698abad6d4ec98ca20bcaaabaeacd5e1ec3f4f -Author: Darren Tucker -Date: Mon Oct 30 13:26:52 2023 +1100 - - Don't exit early when setting up on Mac OS X. - - We probably need some of the other bits in there (specifically, setting - the perms on the home directory) so make it less of a special snowflake. - -commit 1d6a878ceba60b9dc14037dddc8f036070c0065f -Author: dtucker@openbsd.org -Date: Sun Oct 29 06:22:07 2023 +0000 - - upstream: Only try to chown logfiles that exist to prevent spurious - - errors. - - OpenBSD-Regress-ID: f1b20a476734e885078c481f1324c9ea03af991e - -commit e612376427a66f835e284f6b426d16d7c85301bc -Author: anton@openbsd.org -Date: Thu Oct 26 18:52:45 2023 +0000 - - upstream: make use of bsd.regress.mk in extra and interop targets; ok - - dtucker@ - - OpenBSD-Regress-ID: 7ea21b5f6fc4506165093b2123d88d20ff13a4f0 - -commit c868a3b35e1f1d4c0e811a66596312c464cc76e2 -Merge: 5c1ad8dcb 70844a7f5 -Author: Chris Rapier -Date: Fri Oct 27 15:34:08 2023 -0400 - - Merge pull request #56 from rapier1/release_candidates - - Merge 18.2.0-RC1 into Master - -commit ea0039173957d0edcd6469b9614dcedb44dcb4f9 -Author: dtucker@openbsd.org -Date: Thu Oct 26 12:44:07 2023 +0000 - - upstream: Skip conch interop tests when not enabled instead of fatal. - - OpenBSD-Regress-ID: b0abf81c24ac6c21f367233663228ba16fa96a46 - -commit d220b9ed5494252b26b95f05be118472bc3ab5c0 -Author: dtucker@openbsd.org -Date: Wed Oct 25 05:38:08 2023 +0000 - - upstream: Import regenerated moduli. - - OpenBSD-Commit-ID: 95f5dd6107e8902b87dc5b005ef2b53f1ff378b8 - -commit a611e4db4009447a0151f31a44e235ca32ed4429 -Author: anton@openbsd.org -Date: Wed Oct 25 08:01:59 2023 +0000 - - upstream: ssh conch interop tests requires a controlling terminal; - - ok dtucker@ - - OpenBSD-Regress-ID: cbf2701bc347c2f19d907f113779c666f1ecae4a - -commit da951b5e08c167acb5d6e2eec6f146502f5d6ed8 -Author: anton@openbsd.org -Date: Mon Oct 23 11:30:49 2023 +0000 - - upstream: Use private key that is allowed by sshd defaults in conch - - interop tests. - - ok dtucker@ - - OpenBSD-Regress-ID: 3b7f65c8f409c328bcd4b704f60cb3d31746f045 - -commit 1ca166dbb3c0ce632b98869cd955f69320aa6fe8 -Author: Darren Tucker -Date: Fri Oct 20 20:43:00 2023 +1100 - - Install Dropbear for interop testing. - -commit f993bb58351c5cb71e61aede63805a34a6d4daea -Author: Darren Tucker -Date: Fri Oct 20 20:39:03 2023 +1100 - - Resync PuTTY and Conch path handling with upstream. - - Now that configure finds these for us we can remove these -portable - specific changes. - -commit ff85becd5f5f06a76efa45d30fb204a3c5e5215c -Author: Darren Tucker -Date: Fri Oct 20 20:35:46 2023 +1100 - - Have configure find PuTTY and Conch binaries. - - This will let us remove some -portable specific changes from - test-exec.sh. - -commit c54a50359b9cecddbf3ffcdc26efcb3cd6071ec1 -Author: dtucker@openbsd.org -Date: Fri Oct 20 07:37:07 2023 +0000 - - upstream: Allow overriding the locations of the Dropbear binaries - - similar to what we do for the PuTTY ones. - - OpenBSD-Regress-ID: 7de0e00518fb0c8fdc5f243b7f82f523c936049c - -commit fbaa707d455a61d0aef8ae65e02a25bac5351e5c -Author: dtucker@openbsd.org -Date: Fri Oct 20 06:56:45 2023 +0000 - - upstream: Add interop test with Dropbear. - - Right now this is only dbclient not the Dropbear server since it won't - currently run as a ProxyCommand. - - OpenBSD-Regress-ID: 8cb898c414fcdb252ca6328896b0687acdaee496 - -commit c2003d0dbdcdb61ca336c3f90c5c2b4a09c8e73f -Author: Fabio Pedretti -Date: Mon Oct 16 11:59:53 2023 +0200 - - Update openssl-devel dependency in RPM spec. - - Since openssh 9.4p1, openssl >= 1.1.1 is required, so - build with --without-openssl elsewhere. - According to https://repology.org/project/openssl/versions - openssl 1.1.1 is available on fedora >= 29 and rhel >= 8. - Successfully build tested, installed and run on rhel 6 - -commit 064e09cd632721c7e6889904e07767443ee23821 -Author: Fabio Pedretti -Date: Mon Oct 16 10:13:06 2023 +0200 - - Remove reference of dropped sshd.pam.old file - - The file was removed in openssh 8.8 - -commit 62db354b696b378a164b6e478cb6b0171dcb0c3d -Author: dtucker@openbsd.org -Date: Mon Oct 16 08:40:00 2023 +0000 - - upstream: Move declaration of "len" into the block where it's used. - - This lets us compile Portable with -Werror with when OpenSSL doesn't have - Ed25519 support. - - OpenBSD-Commit-ID: e02e4b4af351946562a7caee905da60eff16ba29 - -commit 6eee8c972d5901d10e80634a006b4e346b2c8c19 -Author: Damien Miller -Date: Fri Oct 13 15:15:05 2023 +1100 - - run t-extra regress tests - - This exposes the t-extra regress tests (including agent-pkcs11.sh) as - a new extra-tests target in the top level Makefile and runs them by - default. ok dtucker@ - -commit 637624dbbac13f2bc3c8ec5b15c9d627d07f2935 -Author: Darren Tucker -Date: Thu Oct 12 22:01:23 2023 +1100 - - Don't use make -j2. - - While we have 2 cores available on github runners, not using it means - that the most recent log message is the actual failure, rather than - having to search back through the log for it. - -commit 971e0cfcfd52ef1d73cf5244074c306a60006e89 -Author: Darren Tucker -Date: Thu Oct 12 16:23:05 2023 +1100 - - Correct arg order for ED255519 AC_LINK_IFELSE test. - -commit c616e64688b2a0c1b4daad69b056099be998d121 -Author: djm@openbsd.org -Date: Thu Oct 12 03:51:08 2023 +0000 - - upstream: typos and extra debug trace calls - - OpenBSD-Regress-ID: 98a2a6b9333743274359e3c0f0e65cf919a591d1 - -commit c49a3fbf10162128c67c59562348de2041188974 -Author: djm@openbsd.org -Date: Thu Oct 12 03:48:53 2023 +0000 - - upstream: ensure logs are owned by correct user; feedback/ok - - dtucker@ - - OpenBSD-Regress-ID: c3297af8f07717f1d400a5d34529962f1a76b5a3 - -commit 5ec0ed79ac074c3437b25f6cba8b8cf21c8d4587 -Author: djm@openbsd.org -Date: Thu Oct 12 03:36:32 2023 +0000 - - upstream: 64 %-expansion keys ought to be enough for anybody; ok - - dtucker (we just hit the previous limit in some cases) - - OpenBSD-Commit-ID: 84070f8001ec22ff5d669f836b62f206e08c5787 - -commit f59a94e22e46db2c23eddeb871aa9e8d93ab0016 -Author: djm@openbsd.org -Date: Thu Oct 12 02:48:43 2023 +0000 - - upstream: don't dereference NULL pointer when hashing jumphost - - OpenBSD-Commit-ID: 251c0263e1759a921341c7efe7f1d4c73e1c70f4 - -commit 281c79168edcc303abfd5bca983616eaa24c5f32 -Author: Damien Miller -Date: Thu Oct 12 13:20:01 2023 +1100 - - Solaris: prefer PRIV_XPOLICY to PRIV_LIMIT - - If the system support PRIV_XPOLICY and one is set, then don't - modify PRIV_LIMIT. bz2833, patch from Ron Jordan, ok dtucker@ - -commit 98fc34df837f3a3b79d2a111b96fe8a39adcab55 -Author: djm@openbsd.org -Date: Thu Oct 12 02:18:18 2023 +0000 - - upstream: add %j token that expands to the configured ProxyJump - - hostname (or the empty string if this option is not being used). bz3610, ok - dtucker - - OpenBSD-Commit-ID: ce9983f7efe6a178db90dc5c1698df025df5e339 - -commit 7f3180be8a85320b5d3221714b40c16e66881249 -Author: djm@openbsd.org -Date: Thu Oct 12 02:15:53 2023 +0000 - - upstream: release GSS OIDs only at end of authentication; bz2982, - - ok dtucker@ - - OpenBSD-Commit-ID: 0daa41e0525ae63cae4483519ecaa37ac485d94c - -commit a612b93de5d86e955bfb6e24278f621118eea500 -Author: djm@openbsd.org -Date: Thu Oct 12 02:12:53 2023 +0000 - - upstream: mask SIGINT/TERM/QUIT/HUP before checking quit_pending - - and use ppoll() to unmask them in the mainloop. Avoids race condition between - signaling ssh to exit and polling. bz3531; ok dtucker - - OpenBSD-Commit-ID: 5c14e1aabcddedb95cdf972283d9c0d5083229e7 - -commit 531b27a006116fe7aff325510aaa576f24844452 -Author: djm@openbsd.org -Date: Wed Oct 11 23:23:58 2023 +0000 - - upstream: sync usage() with ssh.1; spotted by kn@ - - OpenBSD-Commit-ID: 191a85639477dcb5fa1616d270d93b7c8d5c1dfd - -commit 64f7ca881b19be754425dca60d1590d306c9d1d0 -Author: djm@openbsd.org -Date: Wed Oct 11 23:14:33 2023 +0000 - - upstream: ssh -Q does not make sense with other command-line options, - - so give it its own line in the manpage - - OpenBSD-Commit-ID: 00a747f0655c12122bbb77c2796be0013c105361 - -commit a752a6c0e1001f93696d7025f0c867f0376e2ecf -Author: djm@openbsd.org -Date: Wed Oct 11 22:42:26 2023 +0000 - - upstream: add ChannelTimeout support to the client, mirroring the - - same option in the server. ok markus@ - - OpenBSD-Commit-ID: 55630b26f390ac063980cfe7ad8c54b03284ef02 - -commit 76e91e7238cdc5662bc818e2a48d466283840d23 -Author: djm@openbsd.org -Date: Wed Oct 11 22:41:05 2023 +0000 - - upstream: add support for reading ED25519 private keys in PEM PKCS8 - - format; ok markus@ tb@ - - OpenBSD-Commit-ID: 01b85c91757e6b057e9b23b8a23f96415c3c7174 - -commit 70844a7f5d74db20fab06f440973bdff23340eed -Author: Chris Rapier -Date: Wed Oct 11 11:01:32 2023 -0400 - - Updated documentation to remove references to HPNBufferSize - and TcpRcvBuf. Neither option are supported any more. - -commit fc77c8e352c0f44125425c05265e3a00c183d78a -Author: djm@openbsd.org -Date: Wed Oct 11 06:40:54 2023 +0000 - - upstream: mention "none" is a valid argument to IdentityFile; bz3080 - - OpenBSD-Commit-ID: 1b4fb590ef731099349a7d468b77f02b240ac926 - -commit c97520d23d1fe53d30725a2af25d2dddd6f2faff -Author: djm@openbsd.org -Date: Wed Oct 11 05:42:08 2023 +0000 - - upstream: in olde rcp/scp protocol mode, when rejecting a path from the - - server as not matching the glob that the client sent, log (at debug level) - the received pathname as well as the list of possible expected paths expanded - from the glob. bz2966 - - OpenBSD-Commit-ID: 0bd8db8a595334ca86bca8f36e23fc0395315765 - -commit 208c2b719879805983398160791d6a1ef9c2c3fc -Author: djm@openbsd.org -Date: Wed Oct 11 04:46:29 2023 +0000 - - upstream: s/%.100s/%s/ in SSH- banner construction as there's no - - reason to limit its size: the version string bring included is a compile time - constant going into an allocated banner string. - - OpenBSD-Commit-ID: 0ef73304b9bf3e534c60900cd84ab699f859ebcd - -commit 0354790826b97c41bbd171a965574e159b58d83e -Author: tb@openbsd.org -Date: Tue Oct 10 06:49:54 2023 +0000 - - upstream: Garbage collect cipher_get_keyiv_len() - - This is a compat20 leftover, unused since 2017. - - ok djm - - OpenBSD-Commit-ID: 91fa5497c9dc6883064624ac27813a567883fdce - -commit 4a775bd3303dd2e7ff41c9fc4c3eb2c115ce0176 -Author: Chris Rapier -Date: Tue Oct 10 17:55:26 2023 -0400 - - This gets rid of everything related to hpn_buffer_size - -commit e903aa1bd12b97120aad4ed6e7dc5478a432f912 -Author: Chris Rapier -Date: Tue Oct 10 16:25:56 2023 -0400 - - Testing the removal of the HPNBufferSize and TcpRcvBuf options as - a) they don't seem to have any sort of impact anymore. This was - likely due to a change in the code sometime in the past 16 years - that I overlooked. - b) the only reason to reimplement them is to create a bandwidth - limiting service which can be implemented in other, more straighforward ways - The upside is that it decreases the codes complexity a bit along with making - it less likely to generate user confusion. Follow up is to see what else - can be simplified and possibly even removing options.hpn_buffer_size entirely. - It's still there because some code paths use it but I don't know if it makes - sense in those situations (like X11 forwarding). - -commit 8b3859aec54135355056b94dd0e1ecb8913ada93 -Author: Chris Rapier -Date: Tue Oct 10 14:52:06 2023 -0400 - - Testing a change to the CI workflow. Trying to deprioritize - Ubuntu 20.04. - -commit 8d29ee4115001a02641386ae394992c65ed279e0 -Author: djm@openbsd.org -Date: Tue Oct 10 03:57:45 2023 +0000 - - upstream: Reserve a range of "local extension" message numbers that - - OpenSSH promises not to use (comment change only) - - OpenBSD-Commit-ID: e61795b453d4892d2c99ce1039112c4a00250e03 - -commit fd93bb238459adb3c587af81ca4028c39fe2e74d -Author: Chris Rapier -Date: Mon Oct 9 17:36:07 2023 -0400 - - Turns out the c89 CI test wasn't actually testing c89. It does now - and showed a lot of issues in binn.h and binn.c. Primarily issues with - using c++ // style comments. There was also an issue in that it wasn't picking up - the fact that inline isn't allowed in c89. That was resolved by including - config.h in binn.h - -commit b6ccab8679ec36bd82e3ddb0249143c29e6070af -Author: Chris Rapier -Date: Mon Oct 9 10:19:38 2023 -0400 - - Valgrind 5 (rekey tests) are taking far too long and - leading to multiple other CI test being cancelled as - the time limit is exceeded. We'll return to this one - as soon as we figure out a few things. - -commit d625c81f89f822d6672030c3d8c2ca4b66bc0d60 -Author: Chris Rapier -Date: Fri Oct 6 17:11:06 2023 -0400 - - Crank version number - -commit 6f608a767797c85810d8e6b933734d42d38f0a4f -Merge: 5c1ad8dcb 80a2f64b8 -Author: Chris Rapier -Date: Fri Oct 6 17:09:59 2023 -0400 - - First pass at porting HPN-SSH to 9.5p1. This will end up being - 18.2.0 - -commit 90b0d73d63a706e85f6431f05a62d2ce1b476472 -Author: djm@openbsd.org -Date: Fri Oct 6 03:32:15 2023 +0000 - - upstream: typo in error message - - OpenBSD-Regress-ID: 6a8edf0dc39941298e3780b147b10c0a600b4fee - -commit e84517f51532ec913d8fb01a8aab7307134774bb -Author: djm@openbsd.org -Date: Fri Oct 6 03:25:14 2023 +0000 - - upstream: Perform the softhsm2 setup as discrete steps rather than - - as a long shell pipeline. Makes it easier to figure out what has happened - when it breaks. - - OpenBSD-Regress-ID: b3f1292115fed65765d0a95414df16e27772d81c - -commit cb54becff4d776238e0e9072943ba0872260535d -Author: claudio@openbsd.org -Date: Sun Sep 24 08:14:13 2023 +0000 - - upstream: REGRESS_FAIL_EARLY defaults to yes now. So no need to - - overload the value here anymore. OK tb@ bluhm@ - - OpenBSD-Regress-ID: f063330f1bebbcd373100afccebc91a965b14496 - -commit f01f5137ceba65baf34ceac5a298c12ac01b1fef -Author: jmc@openbsd.org -Date: Wed Oct 4 05:42:10 2023 +0000 - - upstream: spelling fix; - - OpenBSD-Commit-ID: 493f95121567e5ab0d9dd1150f873b5535ca0195 - -commit 80a2f64b8c1d27383cc83d182b73920d1e6a91f1 -Author: Damien Miller -Date: Wed Oct 4 15:34:10 2023 +1100 - - crank version numbers - -commit f65f187b105d9b5c12fd750a211397d08c17c6d4 -Author: djm@openbsd.org -Date: Wed Oct 4 04:04:09 2023 +0000 - - upstream: openssh-9.5 - - OpenBSD-Commit-ID: 5e0af680480bd3b6f5560cf840ad032d48fd6b16 - -commit ffe27e54a4bb18d5d3bbd3f4cc93a41b8d94dfd2 -Author: djm@openbsd.org -Date: Wed Oct 4 04:03:50 2023 +0000 - - upstream: add some cautionary text about % token expansion and - - shell metacharacters; based on report from vinci AT protonmail.ch - - OpenBSD-Commit-ID: aa1450a54fcee2f153ef70368d90edb1e7019113 - -commit 60ec3d54fd1ebfe2dda75893fa1e870b8dffbb0d -Author: djm@openbsd.org -Date: Tue Oct 3 23:56:10 2023 +0000 - - upstream: fix link to agent draft; spotted by Jann Horn - - OpenBSD-Commit-ID: ff5bda21a83ec013db683e282256a85201d2dc4b - -commit 12e2d4b13f6f63ce2de13cbfcc9e4d0d4b4ab231 -Author: Damien Miller -Date: Wed Oct 4 10:54:04 2023 +1100 - - use portable provider allowlist path in manpage - - spotted by Jann Horn - -commit 6c2c6ffde75df95fd838039850d3dd3d84956d87 -Author: deraadt@openbsd.org -Date: Tue Sep 19 20:37:07 2023 +0000 - - upstream: typo; from Jim Spath - - OpenBSD-Commit-ID: 2f5fba917b5d4fcf93d9e0b0756c7f63189e228e - -commit 5c1ad8dcb9d3cc0917761b0b73f6fda753b760e8 -Merge: ab9495715 e1c4cf3c5 -Author: Chris Rapier -Date: Wed Sep 20 14:39:44 2023 -0400 - - This is the 18.1.0 release of HPN-SSH based on OpenSSH 9.4. The major changes - included in this release are the introduction of a parallel ChaCha20-Poly1305 cipher - called chacha20-poly1305-mt@hpnssh.org. This is now the default cipher used by - HPN-SSH. You may use the serial version of the cipher by explcitly calling it - with -cchacha20-poly1035@openssh.com if you perfer. However, this will only have - an impact on the local instantiation of hpnssh or hpnsshd. To use serial ChaCha20 - on both ends of the connection you must run both the server and client with the - serial version. - - We have also imrpoved the efficacy of the Poly1305 MAC by using OpenSSL functions - to compute the MAC instead of the portable C implementation included in OpenSSH. Our - implemtation of Poly1305 will fall back to the portable implementation if the OpenSSL - EVP is not available. - - There have been other minor changes to improve code readability, improve compatibility - with LibreSSL, support Alpine more gracefully, and so forth. - - Lastly, the versioning scheme as been normalize to Major.Minor.Fix. For example, - this version is 18.1.0 meaning that it is the 18th Major release, the 1st minor - release, and there 0 fixes/patches applied. In this scheme a minor bug fix will - increment the Fix value. A forward port to a new version of OpenSSH or a performance - improvement will increment the Minor value (and reset the Fix value). The introduction - of a major change or functionality will increment the Major value while resetting - both Minor and Fix to 1 and 0 respectively. - - Okayed by mwd@psc.edu and rapier@psc.edu - -commit e1c4cf3c557b623ef4b0dead85d0278f7c1753b6 -Author: Chris Rapier -Date: Thu Sep 14 15:00:37 2023 -0400 - - Removed MUSL from CI tests until we can figure out how to build against it. - Updated Makefile.in to clean regress better. - -commit e8dd25047796461196e8ed29c4697083a1128139 -Author: Chris Rapier -Date: Thu Sep 14 11:53:56 2023 -0400 - - Seems that I had the wrong type (u_int instead of size_t) in the definition - of ssh_aes_ctr() in cipher-ctr-mt.c. Thsi was causing the 'with errors' tests - in the CI build to die. - I have no idea whu this wasn't happening before. - -commit c80ab4603a8185fc67bba784b87cf1002b9d2aa9 -Author: Chris Rapier -Date: Wed Sep 13 17:18:47 2023 -0400 - - Removed tests to build against windows. We can come back to that - later but it will involve cygwin madness - -commit 98ff74de756249f5bc5b65e184b73d11f890e15c -Author: Chris Rapier -Date: Wed Sep 13 17:16:58 2023 -0400 - - OpenSSH changed one of the defined types in their openbsd compat work. This was - causing cipher-ctr-mt to fail when built against OSSL1.1. - - Also, it was a white space issue. Tabs seem to be disallowed in the yml files - for the github ci system - -commit a136e125a1a36fd20b2dc55cd95c5dd6e65c8bfd -Author: Chris Rapier -Date: Wed Sep 13 17:00:48 2023 -0400 - - last test. maybe it's a white space issue? - -commit 8a2c03e26edf90229502995b375825606b1a3271 -Author: Chris Rapier -Date: Wed Sep 13 16:51:03 2023 -0400 - - Bug in .github/workflows/c-cpp.yml. This is a test to see what the problem might be. part 2 - -commit 246ecf98f388437fa28d0b4521708f4ae4c85749 -Author: Chris Rapier -Date: Wed Sep 13 16:50:09 2023 -0400 - - Bug in .github/workflows/c-cpp.yml. This is a test to see what the - -commit e6980e06fc0d9d61e6ccf27ae8c72adec5f4833d -Author: Chris Rapier -Date: Wed Sep 13 16:48:40 2023 -0400 - - Bug in .github/configs - -commit 18fbf570f635e7389d11d8b652bc61b7062b966f -Author: Chris Rapier -Date: Wed Sep 13 16:44:07 2023 -0400 - - Negelected to have defines for WITH_OPENSSL3 in confdigure.ac and updated the version - -commit e44dd52c3ed643954192aac046ec7d2c20af36b2 -Merge: daa5b2d86 b86ad347a -Author: Chris Rapier -Date: Wed Sep 13 15:44:44 2023 -0400 - - first pass at proting 18.1 to 9.4 - -commit b86ad347a5f13d10c8601cc1b2049b771ad218fc -Author: Chris Rapier -Date: Wed Sep 13 14:46:03 2023 -0400 - - Minor cleanup - -commit 308dcc598a06bafeeec3d957ee8420b520521106 -Author: Chris Rapier -Date: Tue Sep 12 16:52:31 2023 -0400 - - Change the NUMSTREAMS define to 64. Lower memory use and current tests - show that there isn't much, if any, performance impact - -commit 31593992602679c77397be8a4eb88706b9fbf1f5 -Author: Chris Rapier -Date: Tue Sep 12 15:05:37 2023 -0400 - - Missed a necessary free in the thread manager - -commit 84d541259d955db3a9fc3d946312a11b2f6f035e -Author: Mitchell Dorrell -Date: Tue Sep 12 04:34:37 2023 -0400 - - Rework CC20-MT to spawn threads on the fly - - Simplify the thread handling by spawning threads as needed. Rename - thread functions to be more descriptive (worker_thread and - manager_thread). The manager thread now spawns worker threads and joins - them as soon as they're complete. - -commit 333ff006018395a39b1910d840857545254b5863 -Author: Mitchell Dorrell -Date: Mon Sep 11 11:10:23 2023 -0400 - - Add missing return-code checking in CC20-MT - - Check return codes in CC20-MT initialization function and implement - cleanup upon encountering a failure condition. Also properly add missing - cleanup code for OpenSSL 1.x in the chachapoly_free_mt() function. - -commit b6b49130a0089b297245ee39e769231d7c763014 -Author: djm@openbsd.org -Date: Sun Sep 10 23:12:32 2023 +0000 - - upstream: rename remote_glob() -> sftp_glob() to match other API - - OpenBSD-Commit-ID: d9dfb3708d824ec02970a84d96cf5937e0887229 - -commit 21b79af6c8d2357c822c84cef3fbdb8001ed263b -Author: djm@openbsd.org -Date: Sun Sep 10 03:51:55 2023 +0000 - - upstream: typo in comment - - OpenBSD-Commit-ID: 69285e0ce962a7c6b0ab5f17a293c60a0a360a18 - -commit 41232d25532b4d2ef6c5db62efc0cf50a79d26ca -Author: Darren Tucker -Date: Sun Sep 10 15:45:38 2023 +1000 - - Use zero-call-used-regs=used with Apple compilers. - - Apple's versions of clang have version numbers that do not match the - corresponding upstream clang versions. Unfortunately, they do still - have the clang-15 zero-call-used-regs=all bug, so for now use the value - that doesn't result in segfaults. We could allowlist future versions - that are known to work. bz#3584 (and probably also our github CI - failures). - -commit 90ccc5918ea505bf156c31148b6b59a1bf5d6dc6 -Author: djm@openbsd.org -Date: Sun Sep 10 03:25:53 2023 +0000 - - upstream: randomise keystroke obfuscation intervals and average - - interval rate. ok dtucker@ - - OpenBSD-Commit-ID: 05f61d051ab418fcfc4857ff306e420037502382 - -commit 3c6ab59f09ada20d4c90c15df6979a07e02e008d -Author: Mitchell Dorrell -Date: Fri Sep 8 12:57:03 2023 -0400 - - Prevent failing CC20-MT threads from pinning CPU - - Break the while loop if the pthread_cond_wait() call fails. This - prevents the thread from spinning indefinitely. - -commit a8ab7d94ab2bae733fe09890b94f130a42dfdf63 -Author: Mitchell Dorrell -Date: Fri Sep 8 12:52:58 2023 -0400 - - Fix pthread_cleanup_pop() issue - - Move the CC20-MT failure condition of pthread_cond_wait outside of the - while loop, so that pthread_cleanup_push() and pthread_cleanup_pop() - remain correctly paired in the same context. - -commit 4b162054d9069276d2e03b98cf96f570aaf22a2e -Author: Mitchell Dorrell -Date: Fri Sep 8 12:46:27 2023 -0400 - - Maintain code style - - Add spaces after 'if' keywords. - -commit dfa6485bec86f38329389cbde62ea045f2199562 -Author: Mitchell Dorrell -Date: Fri Sep 8 12:18:05 2023 -0400 - - Add return-code checks to CC20-MT cipher cleanup - - Verify that cleanup operations are completing successfully, because - failed cleanups could accumulate and lead to a denial of service. - -commit 67876a67780b6bb63c6a8395c0058b54416be4cf -Author: Mitchell Dorrell -Date: Fri Sep 8 11:57:04 2023 -0400 - - Add warning/TODO messages to CC20-MT code - - Indicate specific areas of concern where abnormal execution could cause - significant problems. - -commit 5979a94db447d150ac2acc8cffbd5f2daa823280 -Author: Mitchell Dorrell -Date: Fri Sep 8 11:38:32 2023 -0400 - - Check mutex return codes in CC20-MT threadloop - - Verify that when a worker thread tries to lock a mutex, it actually gets - locked. Without these checks, a call to pthread_mutex_lock() could fail - without interrupting the thread, leading to race conditions and likely - undefined behavior. - -commit bd1b9e52f5fa94d87223c90905c5fdc1a7c32aa6 -Author: djm@openbsd.org -Date: Fri Sep 8 06:34:24 2023 +0000 - - upstream: fix sizeof(*ptr) instead sizeof(ptr) in realloc (pointer here - - is char**, so harmless); spotted in CID 416964 - - OpenBSD-Commit-ID: c61caa4a5a667ee20bb1042098861e6c72c69002 - -commit c4f966482983e18601eec70a1563115de836616f -Author: djm@openbsd.org -Date: Fri Sep 8 06:10:57 2023 +0000 - - upstream: regress test recursive remote-remote directories copies where - - the directory contains a symlink to another directory. - - also remove errant `set -x` that snuck in at some point - - OpenBSD-Regress-ID: 1c94a48bdbd633ef2285954ee257725cd7bc456f - -commit 5e1dfe5014ebc194641678303e22ab3bba15f4e5 -Author: djm@openbsd.org -Date: Fri Sep 8 06:10:02 2023 +0000 - - upstream: fix recursive remote-remote copies of directories that - - contain symlinks to other directories (similar to bz3611) - - OpenBSD-Commit-ID: 7e19d2ae09b4f941bf8eecc3955c9120171da37f - -commit 7c0ce2bf98b303b6ad91493ee3247d96c18ba1f6 -Author: djm@openbsd.org -Date: Fri Sep 8 05:50:57 2023 +0000 - - upstream: regress test for recursive copies of directories containing - - symlinks to other directories. bz3611, ok dtucker@ - - OpenBSD-Regress-ID: eaa4c29cc5cddff4e72a16bcce14aeb1ecfc94b9 - -commit 2de990142a83bf60ef694378b8598706bc654b08 -Author: djm@openbsd.org -Date: Fri Sep 8 05:56:13 2023 +0000 - - upstream: the sftp code was one of my first contributions to - - OpenSSH and it shows - the function names are terrible. - - Rename do_blah() to sftp_blah() to make them less so. - - Completely mechanical except for sftp_stat() and sftp_lstat() which - change from returning a pointer to a static variable (error-prone) to - taking a pointer to a caller-provided receiver. - - OpenBSD-Commit-ID: eb54d6a72d0bbba4d623e2175cf5cc4c75dc2ba4 - -commit 249d8bd0472b53e3a2a0e138b4c030a31e83346a -Author: djm@openbsd.org -Date: Fri Sep 8 05:50:12 2023 +0000 - - upstream: fix scp in SFTP mode recursive upload and download of - - directories that contain symlinks to other directories. In scp mode, the - links would be followed, but in SFTP mode they were not. bz3611, ok dtucker@ - - OpenBSD-Commit-ID: 9760fda668eaa94a992250d7670dfbc62a45197c - -commit 0e1f4401c466fa4fdaea81b6dadc8dd1fc4cf0af -Author: djm@openbsd.org -Date: Wed Sep 6 23:36:09 2023 +0000 - - upstream: regression test for override of subsystem in match blocks - - OpenBSD-Regress-ID: 5f8135da3bfda71067084c048d717b0e8793e87c - -commit 8a1450c62035e834d8a79a5d0d1c904236f9dcfe -Author: djm@openbsd.org -Date: Wed Sep 6 23:35:35 2023 +0000 - - upstream: allow override of Sybsystem directives in sshd Match - - blocks - - OpenBSD-Commit-ID: 3911d18a826a2d2fe7e4519075cf3e57af439722 - -commit 6e52826e2a74d077147a82ead8d4fbd5b54f4e3b -Author: djm@openbsd.org -Date: Wed Sep 6 23:26:37 2023 +0000 - - upstream: allocate the subsystems array as necessary and remove the - - fixed limit of subsystems. Saves a few kb of memory in the server and makes - it more like the other options. - - OpenBSD-Commit-ID: e683dfca6bdcbc3cc339bb6c6517c0c4736a547f - -commit e19069c9fac4c111d6496b19c7f7db43b4f07b4f -Author: djm@openbsd.org -Date: Wed Sep 6 23:23:53 2023 +0000 - - upstream: preserve quoting of Subsystem commands and arguments. - - This may change behaviour of exotic configurations, but the most common - subsystem configuration (sftp-server) is unlikely to be affected. - - OpenBSD-Commit-ID: 8ffa296aeca981de5b0945242ce75aa6dee479bf - -commit 52dfe3c72d98503d8b7c6f64fc7e19d685636c0b -Author: djm@openbsd.org -Date: Wed Sep 6 23:21:36 2023 +0000 - - upstream: downgrade duplicate Subsystem directives from being a - - fatal error to being a debug message to match behaviour with just about all - other directives. - - OpenBSD-Commit-ID: fc90ed2cc0c18d4eb8e33d2c5e98d25f282588ce - -commit 1ee0a16e07b6f0847ff463d7b5221c4bf1876e25 -Author: djm@openbsd.org -Date: Wed Sep 6 23:18:15 2023 +0000 - - upstream: handle cr+lf (instead of just cr) in sshsig signature - - files - - OpenBSD-Commit-ID: 647460a212b916540016d066568816507375fd7f - -commit e1c284d60a928bcdd60bc575c6f9604663502770 -Author: job@openbsd.org -Date: Mon Sep 4 10:29:58 2023 +0000 - - upstream: Generate Ed25519 keys when invoked without arguments - - Ed25519 public keys are very convenient due to their small size. - OpenSSH has supported Ed25519 since version 6.5 (January 2014). - - OK djm@ markus@ sthen@ deraadt@ - - OpenBSD-Commit-ID: f498beaad19c8cdcc357381a60df4a9c69858b3f - -commit 694150ad92765574ff82a18f4e86322bd3231e68 -Author: djm@openbsd.org -Date: Mon Sep 4 00:08:14 2023 +0000 - - upstream: trigger keystroke timing obfucation only if the channels - - layer enqueud some data in the last poll() cycle; this avoids triggering the - obfuscatior for non-channels data like ClientAlive probes and also fixes a - related problem were the obfucations would be triggered on fully quiescent - connections. - - Based on / tested by naddy@ - - OpenBSD-Commit-ID: d98f32dc62d7663ff4660e4556e184032a0db123 - -commit b5fd97896b59a3a46245cf438cc8b16c795d9f74 -Author: djm@openbsd.org -Date: Mon Sep 4 00:04:02 2023 +0000 - - upstream: avoid bogus "obfuscate_keystroke_timing: stopping ..." - - debug messages when keystroke timing obfuscation was never started; spotted - by naddy@ - - OpenBSD-Commit-ID: 5c270d35f7d2974db5c1646e9c64188f9393be31 - -commit ccf7d913db34e49b7a6db1b8331bd402004c840d -Author: djm@openbsd.org -Date: Mon Sep 4 00:01:46 2023 +0000 - - upstream: make channel_output_poll() return a flag indicating - - whether channel data was enqueued. Will be used to improve keystroke timing - obfuscation. Problem spotted by / tested by naddy@ - - OpenBSD-Commit-ID: f9776c7b0065ba7c3bbe50431fd3b629f44314d0 - -commit 43254b326ac6e2131dbd750f9464dc62c14bd5a7 -Author: djm@openbsd.org -Date: Sun Sep 3 23:59:32 2023 +0000 - - upstream: set interactive mode for ControlPersist sessions if they - - originally requested a tty; enables keystroke timing obfuscation for most - ControlPersist sessions. Spotted by naddy@ - - OpenBSD-Commit-ID: 72783a26254202e2f3f41a2818a19956fe49a772 - -commit b53ac254b76e586472de5a2300ec73d0de1f18a1 -Author: Mitchell Dorrell -Date: Fri Sep 1 15:29:57 2023 -0400 - - Fix trivial typo in kex.c - - Change "cppstr" to "ccpstr", because it's not chaPHA20-poly1305, after - all. - -commit 93fa92d0102fc382ad4906c3a64bd990c77091bb -Author: Mitchell Dorrell -Date: Fri Sep 1 15:24:35 2023 -0400 - - Add comments for code readability - - Add comments to kex.c to explain when and where uses of the serial CC20 - implementation get promoted to the multithreaded implementation of the - same cipher. - -commit 4c964eb86826adb398643bfe269b4993e156a53c -Author: Mitchell Dorrell -Date: Fri Sep 1 15:16:18 2023 -0400 - - Refactor list-patching to a separate function - - Move most of the new code in kex_ready() into a separate function, - patch_list(), which has the added bonus of being called twice instead of - duplicating the code. There's a probable memory leak that must be - investigated later. - -commit a9220429754136693d2fa22c5e261e8bfc38dc4c -Author: Mitchell Dorrell -Date: Fri Sep 1 13:53:43 2023 -0400 - - Add comment to sshkey.c to explain commit 66d2e6 - - Add a corresponding comment in sshkey.c to clarify the reason for a - previous commit, so that future review doesn't need to reference the - commit message. - -commit 6ab37626243859439ade0de90ad7d3e76a4f4806 -Author: Mitchell Dorrell -Date: Fri Sep 1 13:35:58 2023 -0400 - - Drop unnecessary #ifdef in sshkey-xmss.c - - Reduce code complexity and improve readability by dropping another - preprocessor conditional, since again, the ensuing code block is always - safe, even when compiled without OpenSSL. - -commit 66d2e67afcbd60c6d0344724aaed494e48af33f2 -Author: Mitchell Dorrell -Date: Fri Sep 1 13:20:55 2023 -0400 - - Drop an unnecessary #ifdef - - Reduce code complexity and improve readability by dropping a - preprocessor conditional, since the ensuing code block is always safe, - even when compiled without OpenSSL. - -commit e1f89158122e1c56b9b50023d96e634345f8093b -Author: Mitchell Dorrell -Date: Fri Sep 1 12:48:43 2023 -0400 - - Fix obvious error in sshkey-xmss.c - - Drop an extra parameter from calls to cipher_crypt() in sshkey-xmss.c. - This wasn't caught earlier due to it being an untested and uncompiled - codepath. - -commit 0c0dd661c97a6be5b223ffbecb9aa222c78cf664 -Author: Mitchell Dorrell -Date: Fri Sep 1 12:38:44 2023 -0400 - - Implement CIPHER_ENCRYPT and CIPHER_DECRYPT - - Improve code readability by replacing arbitrary zeros and ones with the - already-existing preprocessor directives for this purpose, - CIPHER_ENCRYPT and CIPHER_DECRYPT. - -commit 280b4de0f99d4e5a4a2af36aaefff6691abaad30 -Author: Mitchell Dorrell -Date: Fri Sep 1 12:33:45 2023 -0400 - - Introduce CIPHER_SERIAL for function-call clarity - - Replace constant zeros and ones in the final parameter of calls to - cipher_init() with CIPHER_SERIAL and (hypothetically) - CIPHER_MULTITHREADED to improve code readability. - -commit d6b4ed230f58aa58d016790c45fc9d3ce034c5ee -Author: Mitchell Dorrell -Date: Fri Sep 1 11:54:33 2023 -0400 - - Clarify function parameter name in cipher.c - - Rename a parameter in cipher_init from "post_auth" to "enable_threads" - to be more descriptive of the function of the parameter. - -commit 6ac38104c260ed62fb97d22de1fe3eb96ec8123f -Author: Mitchell Dorrell -Date: Fri Sep 1 11:13:07 2023 -0400 - - Add missing WITH_OPENSSL preprocessor directives - - Correct a potential issue where CC20-MT code and data structures were - being referenced even when OpenSSL is disabled at compile-time. - -commit 75b4dbf55ae13fa61422a1123cc5867bdce349f3 -Author: Mitchell Dorrell -Date: Fri Sep 1 11:09:59 2023 -0400 - - Remove commented-out packet.h function signatures - - Remove function signatures that have previously been commented out. - These functions were implemented to simplify another section of code, - but the simplification was unsuccessful in practice. - -commit a3b5a9bc0372d7a9b5866c23c856aafd2422ffff -Author: Mitchell Dorrell -Date: Fri Sep 1 10:49:03 2023 -0400 - - Remove redundant code branches - - Remove a few "else" branches which are redundant with the next statement - anyway. These two structures are equivalent: - if (...) { return f(); } else { return g(); } - if (...) { return f(); } return g(); - but this structure is redundant: - if (...) { return f(); } else { return g(); } return g(); - It has been simplified to the latter of the two aforementioned - equivalent structures, since that plays nicer with nearby "#ifdef"s. - -commit 89d15de950d9cd68e5e9d5874a3470ba38a350d2 -Author: Mitchell Dorrell -Date: Fri Sep 1 10:45:42 2023 -0400 - - Delete already-deactivated code - - Remove a few lines of code which had already been commented out, and - which currently use a comment style which goes against our style guide. - -commit ff3eda68ceb2e2bb8f48e3faceb96076c3e85c20 -Author: Darren Tucker -Date: Thu Aug 31 23:02:35 2023 +1000 - - Set LLONG_MAX for C89 test. - - If we don't have LLONG_MAX, configure will figure out that it can get it - by setting -std=gnu99, at which point we won't be testing C89 any more. - To avoid this, feed it in via CFLAGS. - -commit f98031773db361424d59e3301aa92aacf423d920 -Author: djm@openbsd.org -Date: Tue Aug 29 02:50:10 2023 +0000 - - upstream: make PerSourceMaxStartups first-match-wins; ok dtucker@ - - OpenBSD-Commit-ID: dac0c24cb709e3c595b8b4f422a0355dc5a3b4e7 - -commit cfa66857db90cd908de131e0041a50ffc17c7df8 -Author: djm@openbsd.org -Date: Mon Aug 28 09:52:09 2023 +0000 - - upstream: descriptive text shouldn't be under .Cm - - OpenBSD-Commit-ID: b1afaeb456a52bc8a58f4f9f8b2f9fa8f6bf651b - -commit 01dbf3d46651b7d6ddf5e45d233839bbfffaeaec -Author: djm@openbsd.org -Date: Mon Aug 28 09:48:11 2023 +0000 - - upstream: limit artificial login delay to a reasonable maximum (5s) - - and don't delay at all for the "none" authentication mechanism. Patch by - Dmitry Belyavskiy in bz3602 with polish/ok dtucker@ - - OpenBSD-Commit-ID: 85b364676dd84cf1de0e98fc2fbdcb1a844ce515 - -commit 528da5b9d7c5da01ed7a73ff21c722e1b5326006 -Author: jmc@openbsd.org -Date: Mon Aug 28 05:32:28 2023 +0000 - - upstream: add spacing for punctuation when macro args; - - OpenBSD-Commit-ID: e80343c16ce0420b2aec98701527cf90371bd0db - -commit 3867361ca691d0956ef7d5fb8181cf554a91d84a -Author: djm@openbsd.org -Date: Mon Aug 28 04:06:52 2023 +0000 - - upstream: explicit long long type in timing calculations (doesn't - - matter, since the range is pre-clamped) - - OpenBSD-Commit-ID: f786ed902d04a5b8ecc581d068fea1a79aa772de - -commit 7603ba71264e7fa938325c37eca993e2fa61272f -Author: djm@openbsd.org -Date: Mon Aug 28 03:31:16 2023 +0000 - - upstream: Add keystroke timing obfuscation to the client. - - This attempts to hide inter-keystroke timings by sending interactive - traffic at fixed intervals (default: every 20ms) when there is only a - small amount of data being sent. It also sends fake "chaff" keystrokes - for a random interval after the last real keystroke. These are - controlled by a new ssh_config ObscureKeystrokeTiming keyword/ - - feedback/ok markus@ - - OpenBSD-Commit-ID: 02231ddd4f442212820976068c34a36e3c1b15be - -commit dce6d80d2ed3cad2c516082682d5f6ca877ef714 -Author: djm@openbsd.org -Date: Mon Aug 28 03:28:43 2023 +0000 - - upstream: Introduce a transport-level ping facility - - This adds a pair of SSH transport protocol messages SSH2_MSG_PING/PONG - to implement a ping capability. These messages use numbers in the "local - extensions" number space and are advertised using a "ping@openssh.com" - ext-info message with a string version number of "0". - - ok markus@ - - OpenBSD-Commit-ID: b6b3c4cb2084c62f85a8dc67cf74954015eb547f - -commit d2d247938b38b928f8a6e1a47a330c5584d3a358 -Author: tobhe@openbsd.org -Date: Mon Aug 21 21:16:18 2023 +0000 - - upstream: Log errors in kex_exchange_identification() with level - - verbose instead of error to reduce preauth log spam. All of those get logged - with a more generic error message by sshpkt_fatal(). - - feedback from sthen@ - ok djm@ - - OpenBSD-Commit-ID: bd47dab4695b134a44c379f0e9a39eed33047809 - -commit 9d7193a8359639801193ad661a59d1ae4dc3d302 -Author: djm@openbsd.org -Date: Mon Aug 21 04:59:54 2023 +0000 - - upstream: correct math for ClientAliveInterval that caused the - - probes to be sent less frequently than configured; from Dawid Majchrzak - - OpenBSD-Commit-ID: 641153e7c05117436ddfc58267aa267ca8b80038 - -commit 3c6ab63b383b0b7630da175941e01de9db32a256 -Author: Darren Tucker -Date: Fri Aug 25 14:48:02 2023 +1000 - - Include Portable version in sshd version string. - - bz#3608, ok djm@ - -commit 17fa6cd10a26e193bb6f65d21264d2fe553bcd87 -Author: Darren Tucker -Date: Mon Aug 21 19:47:58 2023 +1000 - - obsd-arm64 host is real hardware... - - so put in the correct config location. - -commit 598ca75c85acaaacee5ef954251e489cc20d7be9 -Author: Darren Tucker -Date: Mon Aug 21 18:38:36 2023 +1000 - - Add OpenBSD ARM64 test host. - -commit 1acac79bfbe207e8db639e8043524962037c8feb -Author: Darren Tucker -Date: Mon Aug 21 18:05:26 2023 +1000 - - Add test for zlib development branch. - -commit 84efebf352fc700e9040c8065707c63caedd36a3 -Author: djm@openbsd.org -Date: Mon Aug 21 04:36:46 2023 +0000 - - upstream: want stdlib.h for free(3) - - OpenBSD-Commit-ID: 743af3c6e3ce5e6cecd051668f0327a01f44af29 - -commit cb4ed12ffc332d1f72d054ed92655b5f1c38f621 -Author: Darren Tucker -Date: Sat Aug 19 07:39:08 2023 +1000 - - Fix zlib version check for 1.3 and future version. - - bz#3604. - -commit 25b75e21f16bccdaa472ea1889b293c9bd51a87b -Author: Darren Tucker -Date: Mon Aug 14 11:10:08 2023 +1000 - - Add 9.4 branch to CI status page. - -commit 803e22eabd3ba75485eedd8b7b44d6ace79f2052 -Author: djm@openbsd.org -Date: Fri Aug 18 01:37:41 2023 +0000 - - upstream: fix regression in OpenSSH 9.4 (mux.c r1.99) that caused - - multiplexed sessions to ignore SIGINT under some circumstances. Reported by / - feedback naddy@, ok dtucker@ - - OpenBSD-Commit-ID: 4d5c6c894664f50149153fd4764f21f43e7d7e5a - -commit e706bca324a70f68dadfd0ec69edfdd486eed23a -Author: djm@openbsd.org -Date: Wed Aug 16 16:14:11 2023 +0000 - - upstream: defence-in-depth MaxAuthTries check in monitor; ok markus - - OpenBSD-Commit-ID: 65a4225dc708e2dae71315adf93677edace46c21 - -commit d1ab7eb90474df656d5e9935bae6df0bd000d343 -Author: djm@openbsd.org -Date: Mon Aug 14 03:37:00 2023 +0000 - - upstream: add message number of SSH2_MSG_NEWCOMPRESS defined in RFC8308 - - OpenBSD-Commit-ID: 6c984171c96ed67effd7b5092f3d3975d55d6028 - -commit fa8da52934cb7dff6f660a143276bdb28bb9bbe1 -Author: Darren Tucker -Date: Sun Aug 13 15:01:27 2023 +1000 - - Add obsd72 and obsd73 test targets. - -commit f9f18006678d2eac8b0c5a5dddf17ab7c50d1e9f -Author: djm@openbsd.org -Date: Thu Aug 10 23:05:48 2023 +0000 - - upstream: better debug logging of sessions' exit status - - OpenBSD-Commit-ID: 82237567fcd4098797cbdd17efa6ade08e1a36b0 - -commit a8c57bcb077f0cfdffcf9f23866bf73bb93e185c -Author: naddy@openbsd.org -Date: Thu Aug 10 14:37:32 2023 +0000 - - upstream: drop a wayward comma, ok jmc@ - - OpenBSD-Commit-ID: 5c11fbb9592a29b37bbf36f66df50db9d38182c6 - -commit e962f9b318a238db1becc53c2bf79dd3a49095b4 -Author: Damien Miller -Date: Thu Aug 10 11:10:22 2023 +1000 - - depend - -commit 0fcb60bf83130dfa428bc4422b3a3ac20fb528af -Author: Damien Miller -Date: Thu Aug 10 11:05:42 2023 +1000 - - update versions in RPM specs - -commit d0cee4298491314f09afa1c4383a66d913150b26 -Author: Damien Miller -Date: Thu Aug 10 11:05:14 2023 +1000 - - update version in README - -commit 78b4dc6684f4d35943b46b24ee645edfdb9974f5 -Author: djm@openbsd.org -Date: Thu Aug 10 01:01:07 2023 +0000 - - upstream: openssh-9.4 - - OpenBSD-Commit-ID: 71fc1e01a4c4ea061b252bd399cda7be757e6e35 - -commit 58ca4f0aa8c4306ac0a629c9a85fb1efaf4ff092 -Author: Darren Tucker -Date: Thu Aug 10 11:30:24 2023 +1000 - - Only include unistd.h once. - -commit daa5b2d869ee5a16f3ef9035aa0ad3c70cf4028e -Author: Damien Miller -Date: Thu Aug 10 11:10:22 2023 +1000 - - depend - -commit 41bfb63f5101fbacde9d8d2ada863f9ee16df194 -Author: Damien Miller -Date: Thu Aug 10 11:05:42 2023 +1000 - - update versions in RPM specs - -commit e598b92b1eecedac21667edf1fe92078eaf8f2b1 -Author: Damien Miller -Date: Thu Aug 10 11:05:14 2023 +1000 - - update version in README - -commit e797e5ffa74377c8696e3b0559a258d836479239 -Author: djm@openbsd.org -Date: Thu Aug 10 01:01:07 2023 +0000 - - upstream: openssh-9.4 - - OpenBSD-Commit-ID: 71fc1e01a4c4ea061b252bd399cda7be757e6e35 - -commit 3961ed02dc578517a9d2535128cff5c3a5460d28 -Author: Damien Miller -Date: Thu Aug 10 09:08:49 2023 +1000 - - wrap poll.h include in HAVE_POLL_H - -commit e535fbe2af893046c28adfcd787c1fdbae36a24a -Author: dtucker@openbsd.org -Date: Fri Aug 4 06:32:40 2023 +0000 - - upstream: Apply ConnectTimeout to multiplexing local socket - - connections. If the multiplex socket exists but the connection times out, - ssh will fall back to a direct connection the same way it would if the socket - did not exist at all. ok djm@ - - OpenBSD-Commit-ID: 2fbe1a36d4a24b98531b2d298a6557c8285dc1b4 - -commit 9d92e7b24848fcc605945f7c2e3460c7c31832ce -Author: Darren Tucker -Date: Thu Aug 3 19:35:33 2023 +1000 - - Fix RNG seeding for OpenSSL w/out self seeding. - - When sshd is built with an OpenSSL that does not self-seed, it would - fail in the preauth privsep process while handling a new connection. - Sanity checked by djm@ - -commit f70010d9b0b3e7e95de8aa0b961e1d74362cfb5d -Author: djm@openbsd.org -Date: Wed Aug 2 23:04:38 2023 +0000 - - upstream: CheckHostIP has defaulted to 'no' for a while; make the - - commented- out config option match. From Ed Maste - - OpenBSD-Commit-ID: e66e934c45a9077cb1d51fc4f8d3df4505db58d9 - -commit c88a8788f9865d02b986d00405b9f0be65ad0b5a -Author: dtucker@openbsd.org -Date: Tue Aug 1 08:15:04 2023 +0000 - - upstream: remove unnecessary if statement. - - github PR#422 from eyalasulin999, ok djm@ - - OpenBSD-Commit-ID: 2b6b0dde4407e039f58f86c8d2ff584a8205ea55 - -commit 77b8b865cd5a8c79a47605c0c5b2bacf4692c4d5 -Author: jmc@openbsd.org -Date: Fri Jul 28 05:42:36 2023 +0000 - - upstream: %C is a callable macro in mdoc(7) - - so, as we do for %D, escape it; - - OpenBSD-Commit-ID: 538cfcddbbb59dc3a8739604319491dcb8e0c0c9 - -commit e0f91aa9c2fbfc951e9ced7e1305455fc614d3f2 -Author: djm@openbsd.org -Date: Fri Jul 28 05:33:15 2023 +0000 - - upstream: don't need to start a command here; use ssh -N instead. - - Fixes failure on cygwin spotted by Darren - - OpenBSD-Regress-ID: ff678a8cc69160a3b862733d935ec4a383f93cfb - -commit f446a44f30bc680e0d026a4204844b02646c1c2d -Author: djm@openbsd.org -Date: Wed May 17 05:52:01 2023 +0000 - - upstream: add LTESTS_FROM variable to allow skipping of tests up to - - a specific point. e.g. "make LTESTS_FROM=t-sftp" will only run the sftp.sh - test and subsequent ones. ok dtucker@ - - OpenBSD-Regress-ID: 07f653de731def074b29293db946042706fcead3 - -commit 8eb8899d612440a9b608bee7f916081d3d0b7812 -Author: djm@openbsd.org -Date: Fri May 12 06:37:42 2023 +0000 - - upstream: test ChrootDirectory in Match block - - OpenBSD-Regress-ID: a6150262f39065939f025e546af2a346ffe674c1 - -commit e43f43d3f19516222e9a143468ea0dc1b3ab67b6 -Author: djm@openbsd.org -Date: Fri May 12 06:36:27 2023 +0000 - - upstream: better error messages - - OpenBSD-Regress-ID: 55e4186604e80259496d841e690ea2090981bc7a - -commit 6958f00acf3b9e0b3730f7287e69996bcf3ceda4 -Author: djm@openbsd.org -Date: Thu Jul 27 22:26:49 2023 +0000 - - upstream: don't incorrectly truncate logged strings retrieved from - - PKCS#11 modules; based on GHPR406 by Jakub Jelen; ok markus - - OpenBSD-Commit-ID: 7ed1082f23a13b38c373008f856fd301d50012f9 - -commit d1ffde6b55170cd4b9a72bfd9a3f17508e6cf714 -Author: djm@openbsd.org -Date: Thu Jul 27 22:25:17 2023 +0000 - - upstream: make sshd_config AuthorizedPrincipalsCommand and - - AuthorizedKeysCommand accept the %D (routing domain) and a new %C (connection - address/port 4-tuple) as expansion sequences; ok markus - - OpenBSD-Commit-ID: ee9a48bf1a74c4ace71b69de69cfdaa2a7388565 - -commit 999a2886ca1844a7a74b905e5f2c8c701f9838cd -Author: djm@openbsd.org -Date: Thu Jul 27 22:23:05 2023 +0000 - - upstream: increase default KDF work-factor for OpenSSH format - - private keys from 16 to 24; { feedback ok } x { deraadt markus } - - OpenBSD-Commit-ID: a3afb1383f8ff0a49613d449f02395d9e8d4a9ec - -commit 0fa803a1dd1c7b546c166000e23a869cf6c4ec10 -Author: Darren Tucker -Date: Thu Jul 27 02:25:09 2023 +1000 - - Prefer OpenSSL's SHA256 in sk-dummy.so - - Previously sk-dummy.so used libc's (or compat's) SHA256 since it may be - built without OpenSSL. In many cases, however, including both libc's - and OpenSSL's headers together caused conflicting definitions. - - We tried working around this (on OpenSSL <1.1 you could define - OPENSSL_NO_SHA, NetBSD had USE_LIBC_SHA2, various #define hacks) with - varying levels of success. Since OpenSSL >=1.1 removed OPENSSL_NO_SHA - and including most OpenSSL headers would bring sha.h in, even if it - wasn't used directly this was a constant hassle. - - Admit defeat and use OpenSSL's SHA256 unless we aren't using OpenSSL at - all. ok djm@ - -commit 36cdb5dbf55c99c0faad06066f56a7c341258c1f -Author: Darren Tucker -Date: Thu Jul 27 10:29:44 2023 +1000 - - Retire dfly58 test VM. Add dfly64. - -commit 2d34205dab08ede9b0676efa57647fc49e6decbe -Author: djm@openbsd.org -Date: Wed Jul 26 23:06:00 2023 +0000 - - upstream: make ssh -f (fork after authentication) work properly in - - multiplexed cases (inc. ControlPersist). bz3589 bz3589 Based on patches by - Peter Chubb; ok dtucker@ - - OpenBSD-Commit-ID: a7a2976a54b93e6767dc846b85647e6ec26969ac - -commit 076aeda86a7ee9be8fd2f0181ec7b9729a6ceb37 -Author: naddy@openbsd.org -Date: Sun Jul 23 20:04:45 2023 +0000 - - upstream: man page typos; ok jmc@ - - OpenBSD-Commit-ID: e6ddfef94b0eb867ad88abe07cedc8ed581c07f0 - -commit 135e7d5fe31f700e6dfc61ce914970c5ee7175ba -Author: jmc@openbsd.org -Date: Thu Jul 20 05:43:39 2023 +0000 - - upstream: tweak the allow-remote-pkcs11 text; - - OpenBSD-Commit-ID: bc965460a89edf76865b7279b45cf9cbdebd558a - -commit c2ae55c9646fb07be29626046558e4cba5703a61 -Author: Chris Rapier -Date: Tue Jul 25 16:01:33 2023 -0400 - - 1) Fixed a problem in AES-MT where it would crash if the stack size for the - threads isn't large enough. In Linux it's 8MB (which oveersized) and in - things like Alpine its (128k). Set it to 1MB. - 2) Added a routine that will fix issues when it's being built under Alpine. This - allows for some stack metrics to be gathered. This changed metrics.h metrics.c and - configure.ac. The change in configure.ac is to automatically check if the application - is being built under Alpine. This reads /etc/os-release and parses out the OS ID. Right - now the only test in the case statement is for Alpine but now we have a system if we need - more stuff like this. - 3) minor change to a typedef in the CC20 fastXOR. Should be a little more portable. - -commit 5f83342b61d1f76c141de608ed2bd293990416bd -Author: Darren Tucker -Date: Tue Jul 25 13:00:22 2023 +1000 - - Handle a couple more OpenSSL no-ecc cases. - - ok djm@ - -commit 58388ffd5487920dc7c941cc99b508fcc3573870 -Author: Chris Rapier -Date: Thu Jul 20 16:50:23 2023 -0400 - - Turns out that fix won't help with the PMA issues in MacOS CI - targets. /etc/pam.d is a protected directory and you need some - sort of user intervention to grant permission to allow the terminal - to make these changes. This is in addition to using sudo. As of now - we'll need to use self hosted runners to make this happen. - - What's interesting is that it pam.d doesn't fail under the ubuntu - tests. For some reason it's either not actually testing pam or - it's using the sshd control file. It would be nice if the behaviour - was predictable - -commit edc2ef4e418e514c99701451fae4428ec04ce538 -Author: Damien Miller -Date: Thu Jul 20 12:53:44 2023 +1000 - - depend - -commit 51fda734e0d3c2df256fc03e8b060c4305be6e59 -Author: Damien Miller -Date: Thu Jul 20 12:53:21 2023 +1000 - - Bring back OPENSSL_HAS_ECC to ssh-pkcs11-client - -commit a1bda23be66c773f63bd07913cda6ae2c404de9c -Author: Chris Rapier -Date: Wed Jul 19 16:44:24 2023 -0400 - - 1) updated version string to new format. - 2) macos with pam was failing CI tests because it - explicitly needs a module named hpnsshd. I think - I modifed setup-ci.sh to handle that. - -commit ab9495715b35116df3ee123d2d0f84013f79ca84 -Merge: 0239f5163 9795c4016 -Author: Chris Rapier -Date: Wed Jul 19 15:26:02 2023 -0400 - - Merging 9.3p2 to deal wth CVE-2023-38408. No other changes - aside from a version bump - -commit 099cdf59ce1e72f55d421c8445bf6321b3004755 -Author: djm@openbsd.org -Date: Wed Jul 19 14:03:45 2023 +0000 - - upstream: Separate ssh-pkcs11-helpers for each p11 module - - Make ssh-pkcs11-client start an independent helper for each provider, - providing better isolation between modules and reliability if a single - module misbehaves. - - This also implements reference counting of PKCS#11-hosted keys, - allowing ssh-pkcs11-helper subprocesses to be automatically reaped - when no remaining keys reference them. This fixes some bugs we have - that make PKCS11 keys unusable after they have been deleted, e.g. - https://bugzilla.mindrot.org/show_bug.cgi?id=3125 - - ok markus@ - - OpenBSD-Commit-ID: 0ce188b14fe271ab0568f4500070d96c5657244e - -commit 29ef8a04866ca14688d5b7fed7b8b9deab851f77 -Author: djm@openbsd.org -Date: Wed Jul 19 14:02:27 2023 +0000 - - upstream: Ensure FIDO/PKCS11 libraries contain expected symbols - - This checks via nlist(3) that candidate provider libraries contain one - of the symbols that we will require prior to dlopen(), which can cause - a number of side effects, including execution of constructors. - - Feedback deraadt; ok markus - - OpenBSD-Commit-ID: 1508a5fbd74e329e69a55b56c453c292029aefbe - -commit 1f2731f5d7a8f8a8385c6031667ed29072c0d92a -Author: djm@openbsd.org -Date: Wed Jul 19 13:56:33 2023 +0000 - - upstream: Disallow remote addition of FIDO/PKCS11 provider - - libraries to ssh-agent by default. - - The old behaviour of allowing remote clients from loading providers - can be restored using `ssh-agent -O allow-remote-pkcs11`. - - Detection of local/remote clients requires a ssh(1) that supports - the `session-bind@openssh.com` extension. Forwarding access to a - ssh-agent socket using non-OpenSSH tools may circumvent this control. - - ok markus@ - - OpenBSD-Commit-ID: 4c2bdf79b214ae7e60cc8c39a45501344fa7bd7c - -commit 892506b13654301f69f9545f48213fc210e5c5cc -Author: djm@openbsd.org -Date: Wed Jul 19 13:55:53 2023 +0000 - - upstream: terminate process if requested to load a PKCS#11 provider - - that isn't a PKCS#11 provider; from / ok markus@ - - OpenBSD-Commit-ID: 39532cf18b115881bb4cfaee32084497aadfa05c - -commit 9795c4016ae35162072144df032c8b262433b462 -Author: Damien Miller -Date: Wed Jul 19 16:27:12 2023 +1000 - - OpenSSH 9.3p2 - -commit bde3635f3c9324bad132cf9ed917813d6abb599e -Author: Damien Miller -Date: Wed Jul 19 16:31:09 2023 +1000 - - update version in README - -commit f673f2f3e5f67099018fc281a6b5fb918142472e -Author: Damien Miller -Date: Wed Jul 19 16:31:00 2023 +1000 - - update RPM spec versions - -commit d7790cdce72a1b6982795baa2b4d6f0bdbb0100d -Author: Damien Miller -Date: Fri Jul 7 13:30:15 2023 +1000 - - disallow remote addition of FIDO/PKCS11 keys - - Depends on the local client performing the session-bind@openssh.com - operation, so non-OpenSSH local client may circumvent this. - -commit b23fe83f06ee7e721033769cfa03ae840476d280 -Author: Damien Miller -Date: Thu Jul 13 12:09:34 2023 +1000 - - terminate pkcs11 process for bad libraries - -commit f3f56df8ec476b2de6cbdbdfdb77a2a61087829d -Author: Damien Miller -Date: Wed Jul 19 12:07:18 2023 +1000 - - agent_fuzz doesn't want stdint.h conditionalised - -commit e0f87f595e21880f61b9a8cc02e6be690423aa35 -Author: Chris Rapier -Date: Tue Jul 18 20:04:58 2023 -0400 - - Replaced explicit OpenSSL version checks with a configure time define - of WITH_OPENSSL3. This has no real functional change but it's more flexible - and easier to read. - -commit 1aaa04024b9a16dbb35010c43f182c9b4a855840 -Author: Chris Rapier -Date: Tue Jul 18 18:32:03 2023 -0400 - - Problem with yaml in c-cpp.yml. Maybe an issue with having tabs - instead of spaces? - -commit cdd7652e8d69ef0c6edbcf6678ad61273f6cb44d -Author: Chris Rapier -Date: Tue Jul 18 18:28:39 2023 -0400 - - Reinstating full range of CI tests. - Also, LibreSSL doesn't support blake2b512 as a digest which is, - of course, what we are using for the resume feature in scp. So we - need to disable that function for LibreSSL - -commit 6eef555a1b5f959eb4798facea6ff318e46000cc -Author: Chris Rapier -Date: Tue Jul 18 16:43:06 2023 -0400 - - It would help if I did not have errors in configure.ac - -commit f307ca29e0d03fb49ad68f4e13f63019a9682c93 -Author: Chris Rapier -Date: Tue Jul 18 16:38:37 2023 -0400 - - I was trying to fix the wrong thing with LibreSSl. I had the - CI set up to use libressl 3.7.0 but we only support 3.7.1 and - higher - -commit d8357287e8526da4d1bf42d67bb8770bd1c7cca1 -Author: Chris Rapier -Date: Tue Jul 18 16:30:28 2023 -0400 - - more libressl configure.ac tests - -commit 8072efade7772173c494cce8b932d7ad1cc45423 -Author: Chris Rapier -Date: Tue Jul 18 16:13:06 2023 -0400 - - testing libressl things - -commit 261cd1820e19ded2443bb07c60dc1b34f7af741c -Author: Chris Rapier -Date: Tue Jul 18 15:36:50 2023 -0400 - - Fixing CI yaml bug - -commit 1339dab39e72489aec270cbb7aad4471be2baf18 -Author: Chris Rapier -Date: Tue Jul 18 15:35:16 2023 -0400 - - testing some new CI tests - -commit 1801369d7abb3c0a9a504b5056e0b780d20f2590 -Author: Chris Rapier -Date: Tue Jul 18 14:53:22 2023 -0400 - - Release candidate for 18v1. This incorporates all the changes - required to get the old RC working with the CI tests. - -commit 750911fd31d307a767cc86e3bfa90bbbb77b1a25 -Author: Damien Miller -Date: Tue Jul 18 15:41:12 2023 +1000 - - conditionalise stdint.h inclusion on HAVE_STDINT_H - - fixes build on AIX5 at least - -commit ff047504fa6e008c4092f8929881816b8993bea0 -Author: Damien Miller -Date: Tue Jul 18 15:30:45 2023 +1000 - - conditionalise match localnetwork on ifaddrs.h - - Fixes build breakage on platforms that lack getifaddrs() - -commit 5853c91da5cac170a59fc13df0c18820998ccc43 -Author: Chris Rapier -Date: Mon Jul 17 13:59:33 2023 -0400 - - This fix should deal with the problem where it - was failing regress/rekey.sh on systems with 1 or 2 cores - -commit b87b03282e466ca2927954ce93f5dbf0bfdc68f6 -Author: djm@openbsd.org -Date: Mon Jul 17 06:16:33 2023 +0000 - - upstream: missing match localnetwork negation check - - OpenBSD-Commit-ID: 9a08ed8dae27d3f38cf280f1b28d4e0ff41a737a - -commit 6d6e185ba29ef4274164b77eab4dc763907f8821 -Author: jmc@openbsd.org -Date: Mon Jul 17 05:41:53 2023 +0000 - - upstream: - add -P to usage() - sync the arg name to -J in usage() - - with that in ssh.1 - reformat usage() to match what "man ssh" does on 80width - - OpenBSD-Commit-ID: 5235dd7aa42e5bf90ae54579d519f92fc107036e - -commit f1a9898283a0638667b587ee4a950afd61ab51b0 -Author: jmc@openbsd.org -Date: Mon Jul 17 05:38:10 2023 +0000 - - upstream: -P before -p in SYNOPSIS; - - OpenBSD-Commit-ID: 535f5257c779e26c6a662a038d241b017f8cab7c - -commit eef4d7e873568e1c84c36bb4034e2c3378250a61 -Author: jsg@openbsd.org -Date: Mon Jul 17 05:36:14 2023 +0000 - - upstream: configuation -> configuration - - OpenBSD-Commit-ID: 4776ced33b780f1db0b2902faec99312f26a726b - -commit dc1dbe94cf6532bd546a3373ad436404f8850e5f -Author: djm@openbsd.org -Date: Mon Jul 17 05:26:38 2023 +0000 - - upstream: move other RCSIDs to before their respective license blocks - - too no code change - - OpenBSD-Commit-ID: ef5bf46b57726e4260a63b032b0b5ac3b4fe9cd4 - -commit ebe11044681caff78834ca6b78311ad19c1860b8 -Author: djm@openbsd.org -Date: Mon Jul 17 05:22:30 2023 +0000 - - upstream: Move RCSID to before license block and away from #includes, - - where it caused merge conflict in -portable for each commit :( - - OpenBSD-Commit-ID: 756ebac963df3245258b962e88150ebab9d5fc20 - -commit 05c08e5f628de3ecf6f7ea20947735bcfa3201e0 -Author: djm@openbsd.org -Date: Mon Jul 17 05:20:15 2023 +0000 - - upstream: return SSH_ERR_KRL_BAD_MAGIC when a KRL doesn't contain a - - valid magic number and not SSH_ERR_MESSAGE_INCOMPLETE; the former is needed - to fall back to text revocation lists in some cases; fixes t-cert-hostkey. - - OpenBSD-Commit-ID: 5c670a6c0f027e99b7774ef29f18ba088549c7e1 - -commit c6fad2c3d19b74f0bd0af1ef040fc74f3a1d9ebb -Author: Damien Miller -Date: Mon Jul 17 14:56:14 2023 +1000 - - avoid AF_LINK on platforms that don't define it - -commit 919bc3d3b712c920de1ae6be5ac6561c98886d7e -Author: djm@openbsd.org -Date: Mon Jul 17 04:08:31 2023 +0000 - - upstream: Add support for configuration tags to ssh(1). - - This adds a ssh_config(5) "Tag" directive and corresponding - "Match tag" predicate that may be used to select blocks of - configuration similar to the pf.conf(5) keywords of the same - name. - - ok markus - - OpenBSD-Commit-ID: dc08358e70e702b59ac3e591827e5a96141b06a3 - -commit 3071d85a47061c1bdaf11a0ac233b501ecba862c -Author: djm@openbsd.org -Date: Mon Jul 17 04:04:36 2023 +0000 - - upstream: add a "match localnetwork" predicate. - - This allows matching on the addresses of available network interfaces - and may be used to vary the effective client configuration based on - network location (e.g. to use a ProxyJump when not on a particular - network). - - ok markus@ - - OpenBSD-Commit-ID: cffb6ff9a3803abfc52b5cad0aa190c5e424c139 - -commit beec17bb311365b75a0a5941418d4b96df7d7888 -Author: djm@openbsd.org -Date: Mon Jul 17 04:01:10 2023 +0000 - - upstream: remove vestigal support for KRL signatures - - When the KRL format was originally defined, it included support for - signing of KRL objects. However, the code to sign KRLs and verify KRL - signatues was never completed in OpenSSH. - - Now, some years later, we have SSHSIG support in ssh-keygen that is - more general, well tested and actually works. So this removes the - semi-finished KRL signing/verification support from OpenSSH and - refactors the remaining code to realise the benefit - primarily, we - no longer need to perform multiple parsing passes over KRL objects. - - ok markus@ - - OpenBSD-Commit-ID: 517437bab3d8180f695c775410c052340e038804 - -commit 449566f64c21b4578d5c0c431badd0328adc53ed -Author: djm@openbsd.org -Date: Mon Jul 17 03:57:21 2023 +0000 - - upstream: Support for KRL extensions. - - This defines wire formats for optional KRL extensions and implements - parsing of the new submessages. No actual extensions are supported at - this point. - - ok markus - - OpenBSD-Commit-ID: ae2fcde9a22a9ba7f765bd4f36b3f5901d8c3fa7 - -commit 18ea857770e84825a3a6238bb37f54864487b59f -Author: dtucker@openbsd.org -Date: Fri Jul 14 07:44:21 2023 +0000 - - upstream: Include stdint.h for SIZE_MAX. Fixes OPENSSL=no build. - - OpenBSD-Commit-ID: e7c31034a5434f2ead3579b13a7892960651e6b0 - -commit 20b768fcd13effe0f2d3619661b6c8592c773553 -Author: Darren Tucker -Date: Fri Jul 14 17:07:32 2023 +1000 - - Fix typo in declaration of nmesg. - -commit 4b94d09542e36ebde2eb9ad89bc68431609932de -Author: Damien Miller -Date: Fri Jul 14 15:34:47 2023 +1000 - - portable-specific int overflow defence-in-depth - - These too are unreachable, but we want the code to be safe regardless of - context. Reported by Yair Mizrahi @ JFrog - -commit 2ee48adb9fc8692e8d6ac679dcc9f35e89ad68f0 -Author: djm@openbsd.org -Date: Fri Jul 14 05:31:44 2023 +0000 - - upstream: add defence-in-depth checks for some unreachable integer - - overflows reported by Yair Mizrahi @ JFrog; feedback/ok millert@ - - OpenBSD-Commit-ID: 52af085f4e7ef9f9d8423d8c1840a6a88bda90bd - -commit 4b43bc358ae6f6b19a973679246dc5172f6ac41b -Author: djm@openbsd.org -Date: Mon Jul 10 04:51:26 2023 +0000 - - upstream: misplaced debug message - - OpenBSD-Commit-ID: d0f12af0a5067a756aa707bc39a83fa6f58bf7e5 - -commit 8c7203bcee4c4f98a22487b4631fe068b992099b -Author: Damien Miller -Date: Wed Jul 12 11:41:19 2023 +1000 - - replace deprecate selinux matchpathcon function - - This function is apparently deprecated. Documentation on what is the - supposed replacement is is non-existent, so this follows the approach - glibc used https://sourceware.org/git/?p=glibc.git;a=patch;h=f278835f59 - - ok dtucker@ - -commit 2da325e7a3423aab7569b90fb5d00755c1da2527 -Author: Chris Rapier -Date: Fri Jul 7 17:06:26 2023 -0400 - - Missed a debig in the regress/rekey.sh test I put in there - -commit 7e8800f5d701efffa39ccb63ca1e095ea777c31a -Author: dtucker@openbsd.org -Date: Thu Jul 6 22:17:59 2023 +0000 - - upstream: minleft and maxsign are u_int so cast appropriately. Prompted - - by github PR#410, ok deraadt. - - OpenBSD-Commit-ID: 0514cd51db3ec60239966622a0d3495b15406ddd - -commit 94842bfe9b09fc93189c6ed0dc9bbebc1d44a426 -Author: dlg@openbsd.org -Date: Tue Jul 4 03:59:21 2023 +0000 - - upstream: add support for unix domain sockets to ssh -W - - ok djm@ dtucker@ - - OpenBSD-Commit-ID: 3e6d47567b895c7c28855c7bd614e106c987a6d8 - -commit 6b1aeb819822db00e2f920f37b2be9339fc9431a -Author: Chris Rapier -Date: Thu Jul 6 14:06:31 2023 -0400 - - Restored rekey.sh to its original form. - -commit 00b019a4fe13d57550cf851ebf4c846410960afd -Author: Chris Rapier -Date: Thu Jul 6 14:04:10 2023 -0400 - - Elminating the swtich to CC20MT did pass all of the expected regression tests. - So I'm restoring that functionality as we now know it's something in the - cipher code itself. - -commit a95fc5eed09a0238fb127b6c50e8498432b79dae -Author: David Seifert -Date: Fri May 12 14:06:01 2023 +0200 - - gss-serv.c: `MAXHOSTNAMELEN` -> `HOST_NAME_MAX` - - `MAXHOSTNAMELEN` is not defined in POSIX, which breaks on musl: - https://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html - - Bug: https://bugs.gentoo.org/834044 - -commit b1bec5ce72ea0065d8a56805481ff18605ea3a1b -Author: Chris Rapier -Date: Fri Jun 30 15:28:10 2023 -0400 - - Another try to get cc20mt from loading. This time by disabling in kex.c - -commit 9b15ce6e990b9e881066b1f7182269afc455e90f -Author: Chris Rapier -Date: Fri Jun 30 14:58:08 2023 -0400 - - Trying to get this to run with cc20mt disabled in the regress test - -commit 3669b52075800c0714bcafb6cfb6393d6376a535 -Author: Chris Rapier -Date: Fri Jun 30 14:30:42 2023 -0400 - - more changes to at least try to get the exit code - -commit d119e07fdc7e99d4d2f7a59d8a6c56e487d08399 -Author: Chris Rapier -Date: Fri Jun 30 12:12:59 2023 -0400 - - Forgot to hit save when restoring fastXOR - -commit 917dd1ff41ba4c8c9542bdcacd199b993e070e1a -Author: Chris Rapier -Date: Fri Jun 30 12:12:24 2023 -0400 - - It wasn't fastXOR. Still seeing the same issue. The specific test it is failing in - regress/rekey.sh is in ssh_data_rekeying() and where it tests the return value of - the operation. However, when I try to print the return value it's always - 0. So I'm skipping that test and relying on the comparison. This is just a test - because I'm wondering if it's actually working but the return code is somehow - messed up. Not a great test but it's sommething - -commit 9c6770854c5dd5c20379d7b371e653b00b5b99ce -Author: Chris Rapier -Date: Fri Jun 30 10:03:57 2023 -0400 - - This is just a test to see if fastXOR really is a problem or not. - I got rid of all the fanciness and replaced it with a very simple - forloop doing the xor one byte at a time. - -commit 6872945b23cc2d011f13d553f0b781f15a281209 -Author: Chris Rapier -Date: Thu Jun 29 17:25:14 2023 -0400 - - Changed a few more things. First, we had been using a complex set of voids to pass - data to pthread functions e.g pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock,... - but pthread_cleanup_push((void *) pthread_mutex_unlock,... works just as well and we don't - get warnings like this anymore: - cast between incompatible function types from ‘int (*)(pthread_mutex_t *)’ {aka ‘int (*)(union *)’} to ‘void (*)(void *)’ */ - Also, when defining the provider in cipher-ctr-mt-provider.c I was getting warning about - missing initializer for field ‘algorithm_description’ of ‘OSSL_ALGORITHM’ - Turns out that the struct has 4 instead of 3 members. Tacking on a NULL in - OSSL_ALGORITHM aes_mt_ciphers[] fixed that warning. - -commit a3bccc1af8beef0e957d0bec831228958119a6cf -Author: Chris Rapier -Date: Thu Jun 29 16:52:10 2023 -0400 - - fastXOR was using 128bit chunks but that was causing unaligned load/store errors - in sanitize. I don't know if we need to care about that but I'm pushing this anyway - to see if it helps with the other problems we have been seeing. - -commit 5b2969a057fcdba21fbd19d61481c7a990d65b2f -Author: Chris Rapier -Date: Wed Jun 28 16:13:54 2023 -0400 - - The error seems very random. It's not consistent on the CI tests which makes me think - it's something particular to the CC20MT cipher. However, I cant recreate it on my - local systems even when it matches one fo the failed runs. Even when I run - the rekey test, where things seem to be failing, multiple times. So I'm - pushing out some more debugging statements in regress/rekey.sh. - -commit 8e09ff92e52db5c4d49607213429f473e6bdcd3f -Author: Chris Rapier -Date: Wed Jun 28 14:09:29 2023 -0400 - - There is a weird issue where the CI tests are randomly failing on github. The problem - seems to occur in the rekey when the rekeylimit is set to 256k. I've tested it - locally but I can't recreate the error. So I removed the 256k test and am pushing it - back to CI to see if it's specific to the 256K test - -commit 782fac8fc37747ee7c5e81113de1a832333786c8 -Author: Chris Rapier -Date: Tue Jun 27 17:38:02 2023 -0400 - - Notes in comments. Pushed to rerun the tests. - -commit 9aa6c0b11a8161467e73566d1b0f867ffd0a4912 -Author: Chris Rapier -Date: Tue Jun 27 14:41:07 2023 -0400 - - Previous version was using gettid in a debug statement. That's not portable so removed. - Additionally, under C99 &c getpid needs to load unistd.h. That's being done now. - -commit 6a03a53357df714cfe6b0f55e76d96a7414f3666 -Author: Chris Rapier -Date: Tue Jun 27 14:09:53 2023 -0400 - - I had an #endif in the wrong place preventing proper flow in cipher.c when - using OpenSSL the the CC20 and CC20MT cipher. - -commit e9b13f86c6189ea3171387c9282885c141b7d954 -Author: Chris Rapier -Date: Mon Jun 26 14:33:51 2023 -0400 - - Those wraps didn't go far enough. Now if it's built without openssl everything - related to the CC20MT cipher is ifdef'd away. - -commit 8ca776cc9320fe6318d7b728beb6f17696ca5ac5 -Author: Chris Rapier -Date: Mon Jun 26 12:27:24 2023 -0400 - - The prior commit didn't actually work. Now I'm just wrapping the calls to - CC20MT functions in ifdefs. Still think there is a better way to do this. - -commit 1682e231ae5215435d847837f7b10543f3b87e1b -Author: Chris Rapier -Date: Mon Jun 26 12:05:56 2023 -0400 - - Need to make sure that the functions in CC20MT are defined as they are - included in cipher.c. So we load the header for CC20MT even if we aren't - building with openssl. - -commit 46a5e05f782e35f862e90c8039912141efcc0acd -Author: Chris Rapier -Date: Fri Jun 23 14:23:44 2023 -0400 - - Looks like this was a commit that never got pushed. Here is the log from it - Turns out that the NONE MAC still makes all of the EVP calls and other - associated work that would happen with a regular MAC. The difference is - that we're not depending on OpenSSL to do anything except return NULL. - However, there is a way in OpenSSH to simply disable all of those routines - by setting mac->enabled to 0. We still need to force both ends to negotiate to - the NONE MAC though. So the prior work on the NONE MAC has to remain but this - does work and saves cycles. So all good. - -commit 8a6cd08850f576e7527c52a1b086cae82fab290e -Author: Darren Tucker -Date: Fri Jun 23 09:49:02 2023 +1000 - - Update runner OS version for hardenedmalloc test. - - Hardenedmalloc dropped support for "legacy glibc" versions in their - 64dad0a69 so use a newer Ubuntu version for the runner for that test. - -commit 925a16810d11fd1d6683ce403d47ffb2aaa02ee9 -Author: Chris Rapier -Date: Thu Jun 22 16:16:21 2023 -0400 - - 1) Now includes startup files for systemd and init.d. - 2) Updated HPN-README with more explicit information about SSL lib support. - 3) Updated HPNSSHInstallation.txt with information about the files in 1). - 4) Added license information and some comments to CC20 files. - -commit cfca6f17e64baed6822bb927ed9f372ce64d9c5b -Author: Damien Miller -Date: Thu Jun 22 15:04:03 2023 +1000 - - handle sysconf(SC_OPEN_MAX) returning > INT_MAX; - - bz3581; ok dtucker - -commit c1c2ca1365b3f7b626683690bd2c68265f6d8ffd -Author: djm@openbsd.org -Date: Wed Jun 21 05:10:26 2023 +0000 - - upstream: better validate CASignatureAlgorithms in ssh_config and - - sshd_config. - - Previously this directive would accept certificate algorithm names, but - these were unusable in practice as OpenSSH does not support CA chains. - - part of bz3577; ok dtucker@ - - OpenBSD-Commit-ID: a992d410c8a78ec982701bc3f91043dbdb359912 - -commit 4e73cd0f4ab3e5b576c56cac9732da62c8fc0565 -Author: djm@openbsd.org -Date: Wed Jun 21 05:08:32 2023 +0000 - - upstream: make `ssh -Q CASignatureAlgorithms` only list signature - - algorithms that are valid for CA signing. Previous behaviour was to list all - signing algorithms, including certificate algorithms (OpenSSH certificates do - not support CA chains). part of bz3577; ok dtucker@ - - OpenBSD-Commit-ID: 99c2b072dbac0f44fd1f2269e3ff6c1b5d7d3e59 - -commit a69062f1695ac9c3c3dea29d3044c72aaa6af0ea -Author: djm@openbsd.org -Date: Wed Jun 21 05:06:04 2023 +0000 - - upstream: handle rlimits > INT_MAX (rlim_t is u64); ok dtucker - - bz3581 - - OpenBSD-Commit-ID: 31cf59c041becc0e5ccb0a77106f812c4cd1cd74 - -commit 8d33f2aa6bb895a7f85a47189913639086347b75 -Author: djm@openbsd.org -Date: Tue Jun 20 23:59:33 2023 +0000 - - upstream: prepare for support for connecting to unix domain sockets - - using ssh -W by explicitly decoding PORT_STREAMLOCAL (a negative number) from - the u32 that's passed over the multiplexing socket; previously code would - just cast, which is UB. - - OpenBSD-Commit-ID: e5ac5f40d354096c51e8c118a5c1b2d2b7a31384 - -commit b4ac435b4e67f8eb5932d8f59eb5b3cf7dc38df0 -Author: djm@openbsd.org -Date: Tue Jun 20 00:05:09 2023 +0000 - - upstream: reset comment=NULL for each key in do_fingerprint(); - - fixes "no comment" not showing on when running `ssh-keygen -l` on multiple - keys where one has a comment and other following keys do not. Patch from - Markus Kuhn via GHPR407, bz3580 - - OpenBSD-Commit-ID: 3cce84456fdcd67dc6b84e369f92c6686d111d9b - -commit b53a809a549dcd4fbde554c6aa283e597b15ea33 -Author: millert@openbsd.org -Date: Mon Jun 5 13:24:36 2023 +0000 - - upstream: Store timeouts as int, not u_int as they are limited to - - INT_MAX. Fixes sign compare warnings systems with 32-bit time_t due to type - promotion. OK djm@ - - OpenBSD-Commit-ID: 48081e9ad35705c5f1705711704a4c2ff94e87b7 - -commit ae1751b3f3bd2f227e89a7abb8d2ac7a3c06ba70 -Author: Chris Rapier -Date: Thu Jun 15 10:03:49 2023 -0400 - - This is release candidate 1 for 17.14. This includes major changes to the - functionality of the default chacha20-poly1305 (CC20) cipher by introducing a - new default of a parallelized chacha20-poly1305 (CC20-MT) cipher. The candidate also - introduces using the OpenSSL poly1305 digest function to replace the native - poly1305 code when compiled with OpenSSL 1.1. When compiled against OpenSSL 3.0+ - poly1305 will use the EVP_MAC functions instead. In ideal conditions we are - seeing improvements of upwards of 30% over HPNSSH-17v13 and about 100% over - OpenSSH. - - Note: We are also seeing improvements when only the receiver is 17v14 as the - receiver often has higher CPU requirements than the sender. - -commit 08834b60aa09e54a078512ad7882f5893bc027cd -Author: Chris Rapier -Date: Tue Jun 13 17:16:12 2023 -0400 - - Checkpoint - issues with too many rekeys caused by logic in cipher-switch. - 'So when I call cipher switch I get the send and receive context and extract the ciphername from it. I can’t use the method you developed because it crashes multiplexing. If I test the ciphername against chacha20-poly1305-mt@hpnssh.org it fails because the name it’s getting chacha20-poly1305@openssh.com. If I change the strcmp test to chacha20-poly1305@openssh.com it works and multiple threads fire up. This also seems to work when using openssh on one side or the other. I’m just confused. I’m happy it’s working but I’m confused. - -commit 723d2d34b55a5673330f7be2a748a29ccd1c4c3c -Author: Chris Rapier -Date: Tue Jun 13 13:40:30 2023 -0400 - - checkpoint failing keyscan regress - -commit 55c536f1b8ede510575adc016b02753b22f5943e -Author: Mitchell Dorrell -Date: Sun Jun 11 21:00:45 2023 -0400 - - Use a special CC20-MT thread to sync with workers - - Move main/worker synchronization into a separate thread that gets - spawned by the main thread dynamically when necessary, allowing the - main thread to more quickly finish its call to crypt(). - -commit 0743b5b4d749a5cbb76a095f3dd8d55e8a01971c -Author: Chris Rapier -Date: Mon Jun 5 17:02:57 2023 -0400 - - Fixed a problem with the keystream buffer being too short in CC20-MT. - Also, updated the if/defs for using the EVP_Digest for poly1305 in OSSL 1.1 - -commit 6c9182a2fbcd82d65305171c8b256bca2bb9b438 -Author: Mitchell Dorrell -Date: Sun May 28 14:11:48 2023 -0400 - - Remove unnecessary checks from CC20 MT - - Improve the multithreaded chacha20-poly1305-mt@hpnssh.org cipher by - removing certain checks from performance-critical sections. These - conditionals did not improve security, and if failed, there was no way - to recover, so they only served a debugging purpose. The checks can be - re-enabled by via "#define SAFETY". - -commit 3265f127fab52be4bc0a8deb52228d21f3b8e55d -Author: Mitchell Dorrell -Date: Sun May 28 13:57:47 2023 -0400 - - Implement Poly1305 using OpenSSL's digest signing - - Demonstrate the significant performance improvement attainable by using - OpenSSL's implementation of Poly1305, accessed through EVP_DigestSign - functions. - - Need to add error-code checking. - -commit 0239f51632aaeb2e649624d017d43b23efda06d5 -Merge: ca574dbcb 31817f93f -Author: Chris Rapier -Date: Fri May 26 13:45:34 2023 -0400 - - Merge pull request #43 from mpounsett/INSTALL_USER_CREATE_ORDER - - Reorder user creation and install steps in install instructions - -commit 5d838b9fb8b46134ba1872f7f668299a138e6071 -Author: Mitchell Dorrell -Date: Thu May 25 13:31:39 2023 -0400 - - Add a missing semicolon - - Correct the simplest of typographical errors... - -commit 7ccc8a1b00c6a7fadcea51c93898205033b5a413 -Author: Mitchell Dorrell -Date: Thu May 25 13:28:36 2023 -0400 - - Fix segmentation fault in poly_auth - - Correct a regression caused by the Poly1305 MAC not being initialized in - the multithreaded CC20 context. Previously, it was being initialized by - the embedded calls to the serial context, but with the multithreaded - context now standing independently, it needs to initialize the MAC - itself. - -commit 2709809fd616a0991dc18e3a58dea10fb383c3f0 -Author: Philip Hands -Date: Wed May 24 19:41:14 2023 +0200 - - fixup! if -s & -p specified, mention 'sftp -P' on - - success - - SSH-Copy-ID-Upstream: 32686e7c65b4fa2846e474d3315102dfa0f043b0 - -commit 204e0bf05161b7641500d7ab266c21217412379f -Author: Darren Tucker -Date: Tue Aug 3 21:25:48 2021 +1000 - - Make ssh-copy-id(1) consistent with OpenSSH. - - This makes the ssh-copy-id man page more consistent with the rest of the - OpenSSH man pages: - - new sentence, new line - - no sentences >80 - - N.B. -> NB - - zap unused .Pp - - zap trailing whitespace - - Report from Debian via mindrot bz#3331, diff from jmc at openbsd.org. - - SSH-Copy-ID-Upstream: d8974cfb6242316460ed22a1ccc662800a50c5d3 - -commit 9de79df66d1430d290fab670bb4b18612875e518 -Author: Philip Hands -Date: Wed May 24 11:45:43 2023 +0200 - - if -s & -p specified, mention 'sftp -P' on success - - This was inspired by this: - https://github.com/openssh/openssh-portable/pull/321 - but I thought that it was better to not do the sed patching. - - BTW the reason one can get away with using $SSH_OPTS throughout, despite - the lowercase -p in there, even if sftp is in use, is that the sftp call - is using the already-established ssh master connection, so the port was - passed to the earlier ssh. - - SSH-Copy-ID-Upstream: 1c124d9bfafdbe28a00b683367ebf5750ce12eb2 - -commit 801cda54c00e0f4e7d89345a90874c8d05dc233a -Author: Philip Hands -Date: Tue May 23 23:07:11 2023 +0200 - - drop whitespace - - SSH-Copy-ID-Upstream: e604fae1cdee35c18055d35dcec530cf12ef00ad - -commit 288482f53613f3e74544eb92deeb24f7c7f1f371 -Author: Philip Hands -Date: Tue May 23 20:52:13 2023 +0200 - - make -x also apply to the target script - - SSH-Copy-ID-Upstream: 3c4214704f427bd0654adf9b0fc079253db21cf4 - -commit b79e7b88ed44f0e4339f0ff35c96c78a92175a8d -Author: Philip Hands -Date: Tue May 23 16:46:42 2023 +0200 - - add -t option to specify the target path - - Allow the default target path (.ssh/authorized_files) to be over-riden - - This was inspired by this MR from Panagiotis Cheilaris - - https://gitlab.com/phil_hands/ssh-copy-id/-/merge_requests/8 - - SSH-Copy-ID-Upstream: a942a0e076874adb6d8b2f0fb76d6c7918190fcd - -commit 914f4ad138714c471ba72fb6d5496b6235320edd -Author: Carlos Rodríguez Gili -Date: Tue Apr 20 19:23:57 2021 +0200 - - Fix test error for /bin/sh on Solaris 10 and older - - On Solaris 10 and older targets /bin/sh is not POSIX-compliant. - Test -z `...` fails with error 'sh: test: argument expected'. - Using quotes around backticks fixes this and doesn't break - POSIX compatibility. - - SSH-Copy-ID-Upstream: 98394072a3f985b2650c1e8eab2fef84e38cc065 - -commit bd382dca316c721aed1e45edcf4c4e0f6374afb0 -Author: Jakub Jelen -Date: Tue Mar 2 21:34:05 2021 +0000 - - Remove outdated comment - - The commit b068122 removed the code dropping the trailing colon, but the comment stayed leaving the code confusing for future readers - - SSH-Copy-ID-Upstream: 930d39f238117cd53810240ec989d0356aa1c1f6 - -commit bdcaf7939029433635d63aade8f9ac762aca2bbe -Author: Darren Tucker -Date: Wed May 10 18:50:46 2023 +1000 - - Special case OpenWrt instead of Dropbear. - - OpenWrt overrides the location of authorized_keys for root. Currently we - assume that all Dropbear installations behave this way, which is not the - case. Check for OpenWrt and root user before using that location instead - of assuming that for all Dropbear servers. Prompted by Github PR#250. - - SSH-Copy-ID-Upstream: 0e1f5d443a9967483c33945793107ae3f3e4af2d - -commit cf84498f67abe93f813a296167b406a0db7b288e -Author: Philip Hands -Date: Thu May 18 18:20:55 2023 +0200 - - ssh-copy-id: add -x option (for debugging) - - This option causes the ssh-copy-id to run with set -x - - SSH-Copy-ID-Upstream: a0ee367ea8c0a29c8b4515245e408d2d349e7844 - -commit b4a1efdcb88f03394c08e7f68ed4e11676830002 -Author: Philip Hands -Date: Thu May 18 17:14:41 2023 +0200 - - update copyright notices - - SSH-Copy-ID-Upstream: c284ed33b361814ea48ff68cbd01ca525b2bf117 - -commit dd98571a01c6bf9cafba3db08cf09d1bf0527af6 -Author: Mitchell Dorrell -Date: Thu May 25 04:12:24 2023 -0400 - - Remove unnecessary parameter from cipher functions - - Remove the pre-auth/post-auth indication parameter from the function - signatures of cipher_crypt() and cipher_get_length(), since they are no - longer used. - -commit eba9547d987fd91de18fc98e11bf80e27ed13ceb -Author: Mitchell Dorrell -Date: Thu May 25 03:59:10 2023 -0400 - - Remove unnecessary temp variable from packet.c - - Free *ccp earlier in packet.c since we don't need *oldccp anymore, which - simplifies some of the if/then/else conditionals. - -commit 823290751bd9e7ecd5aa0a92cea85c3edf133861 -Author: Mitchell Dorrell -Date: Thu May 25 03:39:22 2023 -0400 - - Rework Multi-threaded CC20 to be a separate cipher - - Completely separate the multithreaded implementation of - ChaCha20-Poly1305 from the serial implementation by establishing a new - cipher name, "chacha20-poly1305-mt@hpnssh.org". This allows a number of - simplifications both inside and outside of the multithreaded cipher - implementation. The pre-auth/post-auth check now happens in packet.c - before each cipher initialization. During pre-auth, the serial cipher is - initialized despite retaining the multithreaded cipher's name, - separating the "intent" from the temporary reality. This allows packet.c - to determine whether it should continue using the serial cipher through - a rekey or switch to the multithreaded cipher. Users can now choose at - run-time whether to use the serial or multithreaded cipher by specifying - them by name, just like any other cipher. - - Move sequence number propagation into packet.c. The sequence number is - no longer propagated forward by reading data from the previous cipher - context. Instead, it is passed as an extra parameter to cipher_init. - -commit fcd78e31cdd45a7e69ccfe6d8a3b1037dc1de290 -Author: djm@openbsd.org -Date: Wed May 24 23:01:06 2023 +0000 - - upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand - - appears previously in configuration. Reported by John Meyers in bz3574 ok - dtucker@ - - OpenBSD-Commit-ID: 1c92e4517284386703936e1d3abaa36cfacf1951 - -commit ed57ca61a8b73a482e14bc2861faefa543979ea7 -Author: Mitchell Dorrell -Date: Fri May 19 12:24:56 2023 -0400 - - Change CC20-MT to depend on rekeying after auth - - Improve compatibility with OSSL 3.x by removing dependency on - EVP_CIPHER_CTX_copy(). This leaves no way to "promote" a single-threaded - CC20 context to multithreaded, since there's no practical way to extract - the encryption keys from the serial EVP contexts, and each multithreaded - worker needs its own EVP contexts. The need for promotion can be avoided - by requiring a rekey immediately after authentication. This is - completely working correctly, yet, however, since there's evidence that - it's calling CC20-MT functions before rekeying. - -commit 4fa5cff0f47eb4ae7f36be06e0b1b08bab480272 -Author: Mitchell Dorrell -Date: Fri May 12 12:37:05 2023 -0400 - - Comment out noisy debug statements - - Some of these debug statements appeared to be affecting performance, - even when debug mode is not enabled. - -commit 5fe6f0d5ee3f3da3236da946d8234a88a82ca3e9 -Author: Mitchell Dorrell -Date: Fri May 12 12:30:41 2023 -0400 - - Reimplement multithreaded ChaCha20 using batches - - Significantly rework the multithreaded ChaCha20-Poly1305 implementation - to change the way the main thread triggers the worker threads to - generate new keystreams. Previously, every time a keystream was - consumed, the main thread would trigger a worker to replace it. With - this new implementation, keystreams are generated in batches, and the - main thread only wakes the workers when a complete batch of keystreams - have been consumed. Two batches are tracked at a time, so the main - thread can read from one batch while the workers are generating the next - batch in the other memory space. This greatly reduces the number of - mutex checks and context switches, since there are fewer "small jobs" - and more "big jobs" for workers, and the main thread doesn't need to - worry about any synchronization while it's looping through keystreams - inside one batch. Mutex locks only get invoked on the transition between - batches. - -commit f764d85b3d7f9f1c46f7161e8e0bf384529151bb -Author: Mitchell Dorrell -Date: Fri May 12 12:18:06 2023 -0400 - - Incrementally improve performance of MT ChaCha20 - - Improve CPU efficiency by reducing unnecessary loop cycles. All worker - threads were previously woken every time the main thread consumed a - keystream, because they all shared the same pthreads_cond_t structure. - This change implements a separate pthreads_cond_t for each worker - thread, so that the main thread can selectively wake only the threads - that actually have work to do. I'm not certain whether it's appropriate - for multiple pthreads_cond_t to be associated with the same - pthreads_mutex_t lock (the seqnr lock), but I think this is OK. - - Also, when main does wake a worker, stop scanning EVERY keystream - looking for ones that need to be updated. Consumed keystreams will be - sequential, so the worker can start at the first consumed keystream and - proceed until it first encounters an unused keystream, then stop. This - has the added benefit of chasing the main thread through the keystreams - without having to return to the pthread_cond_wait as often. - - Prevent main from falling back to serial mode when it catches up to the - worker threads. Instead, spin on a mutex and repeatedly check the - variable until the worker threads generate the necessary keystream. - -commit 7891248f457bd27a2241c03da9be4feac44006d9 -Merge: 135968b85 ca574dbcb -Author: Mitchell Dorrell -Date: Fri May 12 00:33:18 2023 -0400 - - Merge branch 'master' into mwd-chacha20libcrypto-mt - - Resynchronizing with master - -commit 135968b85ff2e11152dbd59ffed4668f3b545df1 -Merge: 990e52bc5 992e8ee31 -Author: Mitchell Dorrell -Date: Fri May 12 00:30:46 2023 -0400 - - Merge branch 'master' into mwd-chacha20libcrypto-mt - - Also includes simplifications to cipher-chachapoly-libcrypto-mt. - -commit 5ec5504f1d328d5bfa64280cd617c3efec4f78f3 -Author: dtucker@openbsd.org -Date: Wed May 10 10:04:20 2023 +0000 - - upstream: Remove unused prototypes for ssh1 RSA functions. - - From lengyijun via github PR#396. - - OpenBSD-Commit-ID: 379a5afa8b7a0f3cba0c8a9bcceb4e5e33a5c1ef - -commit fbf362b3891ae4b36052d1b39f37fc618b41c476 -Author: Darren Tucker -Date: Tue May 9 19:26:56 2023 +1000 - - main(void) to prevent unused variable warning. - -commit baf854c8bb0a6d0af5c696c801e631a48dabbaba -Author: Darren Tucker -Date: Tue May 9 19:25:45 2023 +1000 - - Remove warning pragma since clang doesn't like it. - -commit 5fbb7a1349fbbb48ccb1b8cafff2c1854370d87d -Author: Darren Tucker -Date: Tue May 9 17:13:33 2023 +1000 - - Suppress warning for snprintf truncation test. - -commit 47742c513e4e045ecc985c6483fc5c8b050acda2 -Author: Darren Tucker -Date: Tue May 9 17:12:50 2023 +1000 - - Update OpenSSL compat test for 3.x. - -commit 86ad25d455a2313126125540e61e0f9314283f88 -Author: Darren Tucker -Date: Mon May 8 20:23:08 2023 +1000 - - Add macos13 PAM test target. - -commit 77cca2c4b13bc6e5f389565583b6202b0d1bccc2 -Author: Darren Tucker -Date: Mon May 8 20:14:46 2023 +1000 - - Skip agent-peereid test on macos13. - - sudo -S nobody doesn't work on the github runners (probably a - permission issue) so skip that test. - -commit b356b8e91678ea295bcf44df5248c3fbf499fdcf -Author: Darren Tucker -Date: Mon May 8 20:14:28 2023 +1000 - - Include config.guess in debug output. - -commit b7afd8a4ecaca8afd3179b55e9db79c0ff210237 -Author: Darren Tucker -Date: Mon May 8 20:12:59 2023 +1000 - - Handle OpenSSL >=3 ABI compatibility. - - Beyond OpenSSL 3.0, the ABI compatibility guarantees are wider (only - major must match instead of major and minor in earlier versions). - bz#3548, ok djm@ - -commit 0e9e2663eb2c6e9c3e10d15d70418312ae67e542 -Author: dtucker@openbsd.org -Date: Mon May 1 08:57:29 2023 +0000 - - upstream: Import regenerated moduli. - - OpenBSD-Commit-ID: 3d5f811cfcaed8cc4a97e1db49ac61bdf118113c - -commit d9687f49682e1e93383fc15ab2018850b2ef38c3 -Author: Darren Tucker -Date: Mon May 1 11:45:14 2023 +1000 - - Add macos-13 test target. - - Also flatten OS list for clarity. - -commit aacfd6767497b8fa6d41ecdd3f8e265d1e9ef1f6 -Author: djm@openbsd.org -Date: Sun Apr 30 22:54:22 2023 +0000 - - upstream: adjust ftruncate() logic to handle servers that reorder - - requests. - - sftp/scp will ftruncate the destination file after a transfer completes, - to deal with the case where a longer destination file already existed. - We tracked the highest contiguous block transferred to deal with this - case, but our naive tracking doesn't deal with servers that reorder - requests - a misfeature strictly permitted by the protocol but seldom - implemented. - - Adjust the logic to ftruncate() at the highest absolute block received - when the transfer is successful. feedback deraadt@ ok markus@ - - prompted by https://github.com/openssh/openssh-portable/commit/9b733#commitcomment-110679778 - - OpenBSD-Commit-ID: 4af7fac75958ad8507b4fea58706f3ff0cfddb1b - -commit c8eb3941758615c8284a48fff47872db926da63c -Author: djm@openbsd.org -Date: Wed Apr 26 01:36:03 2023 +0000 - - upstream: Check for ProxyJump=none in CanonicalizeHostname logic. - - Previously ssh would incorrectly refuse to canonicalise the hostname - if ProxyJump was explicitly set to "none" when CanonicalizeHostname=yes - - bz3567; ok dtucker - - OpenBSD-Commit-ID: 80a58e43c3a32f97361282f756ec8d3f37989efd - -commit ac383f3a5c6f529a2e8a5bc44af79a08c7da294e -Author: jsg@openbsd.org -Date: Wed Apr 12 14:22:04 2023 +0000 - - upstream: remove duplicate signal.h include - - OpenBSD-Commit-ID: 30c0a34d74d91ddd0e6992525da70d3293392f70 - -commit 740dafa20f3f3d325f6f5d44e990b8c8a6d3d816 -Author: jsg@openbsd.org -Date: Wed Apr 12 08:53:54 2023 +0000 - - upstream: fix double words ok dtucker@ - - OpenBSD-Commit-ID: 44d3223902fbce5276422bdc8063ab72a4078489 - -commit ca574dbcb48b1e52d47390f5be03481421b05ed8 -Author: Chris Rapier -Date: Tue Apr 11 14:53:36 2023 -0400 - - I had failed to reinsert some code to handle oRekeyLimit that I had taken out - for testing purposes. This was causing the rekey regression test to fail. - -commit 5a3b9631c78467bac12580defa76b08a5cdcd83a -Author: Chris Rapier -Date: Tue Apr 11 13:54:11 2023 -0400 - - Memory usage is way down. 1) I stopped over committing memory in sshbuf_allocate and - 2) I changed PACKET_MAX_SIZE from a define at 256KB to a variable that is 256KB pre-auth - (to handle large banners) to SSH_IOBUFSZ + 1KB post auth. - My concerns about the aes-ctr-mt cipher being slow were not founded. I was testing the - wrong version. - -commit 5d93a1fb8fc3e2b6adb19e86ba7a61723896e9e6 -Merge: 865d67bac aa5383c10 -Author: Chris Rapier -Date: Tue Apr 11 10:38:07 2023 -0400 - - Merge branch 'buffer-fix' into pre-stage - - Last round of fixes to handle excessive memory usage. - -commit aa5383c10b8edff4e0415561e373d421db0be183 -Author: Chris Rapier -Date: Tue Apr 11 10:37:04 2023 -0400 - - I think this takes care of the memory issues. However, - it looks like there might be something going on with the - aes-ctr-mt cipher. It seems to be slower than the default - cipher. I need to verify that. - -commit 6452f89577ec4f22440c31b8e19b061d1a7c4b2a -Author: Darren Tucker -Date: Tue Apr 11 16:49:19 2023 +1000 - - Test against LibreSSL 3.7.2. - -commit b9bfb5dcaded58a9b0b8d2a3dc3bbc3f8278b885 -Author: Chris Rapier -Date: Mon Apr 10 14:50:12 2023 -0400 - - Still trying to figure out how to maintain a minimal memory profile - while maintaining performance. When the memory is huge (by setting - rlen to a huge size in sshbuf_allocate) we get higher perfomance but - the memory usage is stupid. - - This commit also change the rekey frequency for CC20. That was taken - from a post made by Damien Miller - -commit 865d67bac7eb79a42df5a3ce4cf7c2180e111595 -Author: Chris Rapier -Date: Fri Apr 7 13:43:25 2023 -0400 - - /* OpenSSH usings 256KB packet size max but that consumes a - * lot of memory with the buffers we are using. However, we need - * a large packet size if the banner that's being sent is large. - * So we need a 256KB packet pre authentication and a smaller one - * in this case SSH_IOBUFSZ + 1KB, afterwards. So we change - * PACKET_MAX_SIZE from a #define to a global. Then, in the function - * ssh_packet_set_authentcated we reduce the size to something - * more memory efficient. -cjr 04/07/23 - */ - -commit 20da8e994210d1816daf134f4deaf9b8b2d0b8eb -Author: Chris Rapier -Date: Thu Apr 6 17:55:44 2023 -0400 - - banner size 100,000 test is failing. Removing it for now to see - if it fails other tests. Will address this. Might be related to change in packet_size_max - -commit d1ccfb0a4c6929a1c83d0e2f2748bdad38625791 -Author: Chris Rapier -Date: Thu Apr 6 17:35:08 2023 -0400 - - It turns out that I had serious memory issues that were consuming at least 500MB on each side. - Basically, it was how I was forcing things to grown to the maximum allocation size in - sshbuf_allocate. Additionally, PACKET_MAX_SIZE was putting more pressure on things when it was - at the default of 256KB. I reduced it to SSH_IOBUFSZ + 1K (so 33KB) and it seems to be a lot - more responsive and a lot less memory hungry. - - Lastly, I added two new thingt o aid with debugging. The first is the ability to label the sshbuf structs - that are being created. This is just a freeform text label that defaults to the function name of - the function that called sshbuf_new. Second is a routine called read_mem_stats that gets the - current memory usage of the application. This only works under linux though as it requires access - to proc. - -commit b1f600237b8509db65544508fde248d2c5227c5b -Author: Chris Rapier -Date: Thu Apr 6 17:25:45 2023 -0400 - - missed a couple of debugs - -commit 7ce51dbc6c8b49923b5bfc7773dc09bb9c8ea2f1 -Author: Chris Rapier -Date: Thu Apr 6 17:23:54 2023 -0400 - - checkpoint - extra debugs and such removed - -commit ed25051f737b56e66aee2008b8e2a66c263eba4a -Author: Chris Rapier -Date: Thu Apr 6 17:05:37 2023 -0400 - - checkpoint - starting to remove debugs and tests 2 - -commit 01007a674b7d4ccf0005375d12e89c2f0819a6cd -Author: Chris Rapier -Date: Thu Apr 6 17:03:34 2023 -0400 - - checkpoint - starting to remove debugs and tests - -commit f21f04db01e4e51d7b3c013d887d0d6ae5a81016 -Author: Chris Rapier -Date: Thu Apr 6 16:30:25 2023 -0400 - - checkpoint - -commit 69cba3e3d897e04f0bdb5c9eb03a3cdf5028c182 -Author: Chris Rapier -Date: Thu Apr 6 13:01:17 2023 -0400 - - checkpoint - reduced the stack size of the threads. Some minor benefit - -commit 2138f6be595ca106fe4805a1e3ab9c4d8acc697b -Author: Damien Miller -Date: Thu Apr 6 14:33:10 2023 +1000 - - remove unused upper-case const strings in fmtfp - - no float format that uses upper-case is supported nor are hex floats. - ok dtucker - -commit 484c5e6168fdb22cbcd73c4ff987cf9ca47989ca -Author: djm@openbsd.org -Date: Thu Apr 6 03:56:02 2023 +0000 - - upstream: simplify sshsig_find_principals() similar to what happened to - - sshsig_check_allowed_keys() in r1.31, removing some dead code - - OpenBSD-Commit-ID: a493e628d4d6c08f878c276d998f4313ba61702d - -commit 3a7b110fbc7e096423f8f7b459deffe4c65d70f4 -Author: djm@openbsd.org -Date: Thu Apr 6 03:21:31 2023 +0000 - - upstream: remove redundant ssh!=NULL check; we'd already - - dereferenced it - - OpenBSD-Commit-ID: 852bf12591ec5a9fb12dcbde9b1fd3945ad0df3c - -commit 2519110659a1efac6c976895a86659d1b341c91b -Author: djm@openbsd.org -Date: Thu Apr 6 03:19:32 2023 +0000 - - upstream: match_user() shouldn't be called with user==NULL unless - - host and ipaddr are also NULL - - OpenBSD-Commit-ID: fa3518346c21483e9e01a2e4b9436ae501daf8ea - -commit 3b9ceaad7ad63c1c03c2a89e148340ad3a62a482 -Author: djm@openbsd.org -Date: Thu Apr 6 03:12:32 2023 +0000 - - upstream: don't care about glob() return value here. - - OpenBSD-Commit-ID: 85bb82fea90478a482e9f65a1bec0aa24227fd66 - -commit 272772d1965f47d6c6a69eaa31078729fd6f7e99 -Author: Chris Rapier -Date: Wed Apr 5 15:23:28 2023 -0400 - - checkpoint - -commit 6869dfbb61e71bf3cc0d1124b368e0f9e73444d2 -Author: Chris Rapier -Date: Tue Apr 4 17:40:08 2023 -0400 - - checkpoint trying to find source of memory in aes cipher init - -commit 2b25bf96fc7bcb0470218ca300381076f58abf25 -Author: Chris Rapier -Date: Tue Apr 4 12:50:02 2023 -0400 - - The memory epxlosion is happening in all versions of the - threaded aes-ctr cipher. So it's not a provider issue which is good. I might be over allocating - one of the structs. This seems like the most likely thing. I'm going to check to - see if this memory issue happens in older versions next. - -commit a5c4dfd1f152948fb011a00b34d64371762a2ea9 -Author: Chris Rapier -Date: Mon Apr 3 16:18:56 2023 -0400 - - testing if I need both ssh_packet_set_authenticated and - -commit ef310e644982858136968ba61166f2e9182b32fe -Author: Chris Rapier -Date: Mon Apr 3 16:18:03 2023 -0400 - - commit - -commit 7e24679c57c59b64a13468991b93647b15306d74 -Author: Chris Rapier -Date: Mon Apr 3 16:17:16 2023 -0400 - - do the same for the server side - -commit 5909af195ed3d6942688020417c09b498c5b16b6 -Author: Chris Rapier -Date: Mon Apr 3 16:11:40 2023 -0400 - - a prior change wasn't allowing aes_ctr_mt to rekey directly - after authentication. This should fix it - -commit 09d8da0849e2791b2500267cda333cd238f38754 -Author: dtucker@openbsd.org -Date: Mon Apr 3 08:10:54 2023 +0000 - - upstream: Move up null check and simplify process_escapes. - - Based on Coverity CID 291863 which points out we check the channel - pointer for NULLness after dereferencing it. Move this to the start - of the function, and while there simplify initialization of efc a bit. - ok djm@ - - OpenBSD-Commit-ID: de36e5ad6fde0fe263ca134e986b9095dc59380a - -commit b36b162be5e6206f12b734222b7bc517c13a6bc8 -Author: Damien Miller -Date: Fri Mar 31 14:51:20 2023 +1100 - - need va_end() after va_copy(); ok dtucker - - spotted by Coverity - -commit 9d16b1c9e4941b156e99e1df2b4ec0f368ee52dd -Author: Chris Rapier -Date: Fri Mar 31 11:27:17 2023 -0400 - - checkpoint reduce PMS to 36K as a test - -commit f703757234a5c585553e72bba279b255a272750a -Author: dtucker@openbsd.org -Date: Fri Mar 31 05:56:36 2023 +0000 - - upstream: Explicitly ignore return from waitpid here too. - - OpenBSD-Commit-ID: eef2403df083c61028969fc679ee370373eacacb - -commit 6b73aa29035991d1448a1a76f63ac152a6bf931c -Author: dtucker@openbsd.org -Date: Fri Mar 31 04:45:08 2023 +0000 - - upstream: Explictly ignore return codes - - where we don't check them. - - OpenBSD-Commit-ID: 1ffb03038ba1b6b72667be50cf5e5e396b5f2740 - -commit 6f0308a3e717ebe68eeb3f95253612fab5dbf20e -Author: dtucker@openbsd.org -Date: Fri Mar 31 04:42:29 2023 +0000 - - upstream: Return immediately from get_sock_port - - if sock <0 so we don't call getsockname on a negative FD. From Coverity - CID 291840, ok djm@ - - OpenBSD-Commit-ID: de1c1130646230c2eda559831fc6bfd1b61d9618 - -commit 1c1124dc901fca1ea2cb762044b8f1a5793a2bed -Author: djm@openbsd.org -Date: Fri Mar 31 04:23:02 2023 +0000 - - upstream: don't leak arg2 on parse_pubkey_algos error path; ok - - dtucker@ - - OpenBSD-Commit-ID: 7d0270ad3dd102412ca76add2b3760518abdef75 - -commit 8ba2d4764bb6a4701cd447d8b52604622ffe65f4 -Author: djm@openbsd.org -Date: Fri Mar 31 04:22:27 2023 +0000 - - upstream: clamp max number of GSSAPI mechanisms to 2048; ok dtucker - - OpenBSD-Commit-ID: ce66db603a913d3dd57063e330cb5494d70722c4 - -commit 1883841fc13d0eada8743cac5d3abe142ee2efa7 -Author: djm@openbsd.org -Date: Fri Mar 31 04:21:56 2023 +0000 - - upstream: don't print key if printing hostname failed; with/ok - - dtucker@ - - OpenBSD-Commit-ID: ad42971a6ee5a46feab2d79f7f656f8cf4b119f3 - -commit c6011129cafe4c411f6ef670a4cf271314708eb8 -Author: djm@openbsd.org -Date: Fri Mar 31 04:04:15 2023 +0000 - - upstream: remove redundant test - - OpenBSD-Commit-ID: 6a0b719f9b1ae9d42ad8c5b144c7962c93792f7c - -commit 4fb29eeafb40a2076c0dbe54e46b687c318f87aa -Author: djm@openbsd.org -Date: Fri Mar 31 04:00:37 2023 +0000 - - upstream: don't attempt to decode a ridiculous number of - - attributes; harmless because of bounds elsewhere, but better to be explicit - - OpenBSD-Commit-ID: 1a34f4b6896155b80327d15dc7ccf294b538a9f2 - -commit fc437c154ef724621a4af236de9bc7e51a8381ae -Author: djm@openbsd.org -Date: Fri Mar 31 03:22:49 2023 +0000 - - upstream: remove unused variable; prompted by Coverity CID 291879 - - OpenBSD-Commit-ID: 4c7d20ef776887b0ba1aabcfc1b14690e4ad0a40 - -commit 0eb8131e4a53b33a8fc9b9ab694e6b6778b87ade -Author: dtucker@openbsd.org -Date: Fri Mar 31 00:44:29 2023 +0000 - - upstream: Check fd against >=0 instead of >0 in error path. The - - dup could in theory return fd 0 although currently it doesn't in practice. - From Dmitry Belyavskiy vi github PR#238. - - OpenBSD-Commit-ID: 4a95f3f7330394dffee5c749d52713cbf3b54846 - -commit 7174ba6f8a431ca4257767a260fc50e204068242 -Author: dtucker@openbsd.org -Date: Thu Mar 30 07:19:50 2023 +0000 - - upstream: Ignore return value from muxclient(). It normally loops - - without returning, but it if returns on failure we immediately exit. - Coverity CID 405050. - - OpenBSD-Commit-ID: ab3fde6da384ea588226037c38635a6b2e015295 - -commit a4c1c2513e36f111eeaa1322c510067930e5e51e -Author: Damien Miller -Date: Fri Mar 31 14:17:22 2023 +1100 - - don't call connect() on negative socket - - Coverity CID 405037 - -commit 85b54e8eb3efbc3aa291c86267d789963747829b -Author: Chris Rapier -Date: Thu Mar 30 16:53:14 2023 -0400 - - checkpoint trying to increase PACKET_MAX_SIZE again - -commit d73848700d6e4d98d5c0396ce1ea34a01fb94ef8 -Author: Chris Rapier -Date: Thu Mar 30 16:38:10 2023 -0400 - - checkpoint - testing something - -commit 3911857c94981775de36cb53430bb703f8765485 -Author: Chris Rapier -Date: Thu Mar 30 16:02:22 2023 -0400 - - checkpoint - remove excess debugs - -commit 08ff1b2e70b0f639bc213bff8116478eb5c1bb91 -Author: Chris Rapier -Date: Thu Mar 30 08:56:14 2023 -0400 - - checkpoint reduce packet max size - -commit 34ee842cdd981a759fe8f0d4a37521f9a1c63170 -Author: djm@openbsd.org -Date: Thu Mar 30 03:05:01 2023 +0000 - - upstream: return SSH_ERR_KEY_NOT_FOUND if the allowed_signers file - - is empty, not SSH_ERR_INTERNAL_ERROR. Also remove some dead code spotted - by Coverity; with/ok dtucker@ - - OpenBSD-Commit-ID: 898a1e817cda9869554b1f586a434f67bcc3b650 - -commit f108e77a9dc9852e72215af1bf27731c48434557 -Author: dtucker@openbsd.org -Date: Thu Mar 30 00:49:37 2023 +0000 - - upstream: Remove dead code from inside if block. - - The only way the if statement can be true is if both dup()s fail, and - in that case the tmp2 can never be set. Coverity CID 291805, ok djm@ - - OpenBSD-Commit-ID: c0d6089b3fb725015462040cd94e23237449f0c8 - -commit 05b8e88ebe23db690abbfb1a91111abea09cde08 -Author: Darren Tucker -Date: Thu Mar 30 13:53:29 2023 +1100 - - child_set_eng: verify both env pointer and count. - - If child_set env was called with a NULL env pointer and a non-zero count - it would end up in a null deref, although we don't currently do this. - Prompted by Coverity CID 291850, tweak & ok djm@ - -commit 28f1b8ef9b84b8cd2f6c9889a0c60aa4a90dadfa -Author: dtucker@openbsd.org -Date: Wed Mar 29 01:07:48 2023 +0000 - - upstream: Ignore return from sshpkt_disconnect - - since we set our own return value for the function. Coverity CID 291797, - ok djm@ - - OpenBSD-Commit-ID: 710b57ba954c139240895e23feea41f203201f04 - -commit c3da05d95922f5550bcc7815e799474d6a160175 -Author: dtucker@openbsd.org -Date: Wed Mar 29 00:59:08 2023 +0000 - - upstream: Plug potential mem leak in process_put. - - It allocates abs_dst inside a loop but only frees it on exit, so free - inside the loop if necessary. Coverity CID 291837, ok djm@ - - OpenBSD-Commit-ID: a01616503a185519b16f00dde25d34ceaf4ae1a3 - -commit 13ae327eae598b1043e5ec30e4b170edb3c898a5 -Author: djm@openbsd.org -Date: Wed Mar 29 00:18:35 2023 +0000 - - upstream: fix memory leak; Coverity CID 291848 - - with/ok dtucker@ - - OpenBSD-Commit-ID: 37f80cb5d075ead5a00ad1b74175684ab1156ff8 - -commit 9ffa76e1284c85bf459c3dcb8e995733a8967e1b -Author: dtucker@openbsd.org -Date: Tue Mar 28 07:44:32 2023 +0000 - - upstream: Plug more mem leaks in sftp by making - - make_absolute_pwd_glob work in the same way as make_absolute: you - pass it a dynamically allocated string and it either returns it, or - frees it and allocates a new one. Patch from emaste at freebsd.org and - https://reviews.freebsd.org/D37253 ok djm@ - - OpenBSD-Commit-ID: 85f7404e9d47fd28b222fbc412678f3361d2dffc - -commit 82b2b8326962b1a98af279bc5bbbbbcab15b3e45 -Author: dtucker@openbsd.org -Date: Tue Mar 28 06:12:38 2023 +0000 - - upstream: Remove compat code for OpenSSL < 1.1.* - - since -portable no longer supports them. - - OpenBSD-Commit-ID: ea2893783331947cd29a67612b4e56f818f185ff - -commit b500afcf00ae1b6b73b2ccf171111dfbfeaef74d -Author: dtucker@openbsd.org -Date: Mon Mar 27 23:56:54 2023 +0000 - - upstream: Remove compat code for OpenSSL 1.0.* - - versions now that -portable has dropped support for those versions. - - OpenBSD-Regress-ID: 82a8eacd87aec28e4aa19f17246ddde9d5ce7fe7 - -commit 727560e6011efcb36d2f3ac6910444bc775abaa1 -Author: Darren Tucker -Date: Tue Mar 28 18:06:42 2023 +1100 - - Prevent conflicts between Solaris SHA2 and OpenSSL. - - We used to prevent conflicts between native SHA2 headers and OpenSSL's - by setting OPENSSL_NO_SHA but that was removed prior to OpenSSL 1.1.0 - -commit 46db8e14b7f186d32173dcdecd5b785334429b8b -Author: Darren Tucker -Date: Tue Mar 28 12:44:03 2023 +1100 - - Remove HEADER_SHA_H from previous... - - since it causes more problems than it solves. - -commit 72bd68d37387aa5f81da928f6e82f1c88ed8f674 -Author: Darren Tucker -Date: Tue Mar 28 10:35:18 2023 +1100 - - Replace OPENSSL_NO_SHA with HEADER_SHA_H. - - Since this test doesn't use OpenSSL's SHA2 and may cause conflicts we - don't want to include it, but OPENSSL_NO_SHA was removed beginning in - OpenSSL's 1.1 series. - -commit 99668f2e6e0deb833e46cfab56db59ff0fc28c7e -Author: Darren Tucker -Date: Tue Mar 28 09:50:06 2023 +1100 - - Configure with --target instead of deprecated form. - -commit fc22161b5cb49f2861af4e8055f97d5c0989e972 -Author: Chris Rapier -Date: Mon Mar 27 16:09:29 2023 -0400 - - imported the buffer label work from buffer-names - -commit 31817f93fbb3fe27cb26779f688c6e519023c5e8 -Author: Matthew Pounsett -Date: Mon Mar 27 10:45:40 2023 -0400 - - Reorder user creation and install steps in install instructions, fixes #42 - -commit f751d9306c62cd1061f966e6a7483d9bab9c379b -Author: Darren Tucker -Date: Mon Mar 27 22:05:29 2023 +1100 - - Pass rpath when building 64bit Solaris. - -commit a64b935cd450ee8d04c26c9cd728629cf9ca5c91 -Author: Darren Tucker -Date: Mon Mar 27 19:21:19 2023 +1100 - - Explicitly disable OpenSSL on AIX test VM. - -commit 7ebc6f060fc2f70495a56e16d210baae6424cd96 -Author: dtucker@openbsd.org -Date: Mon Mar 27 03:56:50 2023 +0000 - - upstream: Add RevokedHostKeys to percent expansion test. - - OpenBSD-Regress-ID: c077fd12a38005dd53d878c5b944154dec88d2ff - -commit f1a17de150f8d309d0c52f9abfaebf11c51a8537 -Author: dtucker@openbsd.org -Date: Mon Mar 27 03:56:11 2023 +0000 - - upstream: Add tilde and environment variable expansion to - - RevokedHostKeys. bz#3552, ok djm@ - - OpenBSD-Commit-ID: ce5d8e0219b63cded594c17d4c2958c06918ec0d - -commit 009eb4cb48a9708ab9174684dcbcc0f942907abe -Author: djm@openbsd.org -Date: Mon Mar 27 03:31:05 2023 +0000 - - upstream: fix test: getnameinfo returns a non-zero value on error, not - - (neccessarily) -1. From GHPR#384 - - OpenBSD-Commit-ID: d35e2b71268f66f5543a7ea68751972b3ae22b25 - -commit 4f0a676486700f10a4788f7e9426e94e39c1c89e -Author: djm@openbsd.org -Date: Mon Mar 27 03:25:08 2023 +0000 - - upstream: scp: when copying local->remote, check that source file - - exists before opening SFTP connection to the server. Based on GHPR#370 ok - dtucker, markus - - OpenBSD-Commit-ID: b4dd68e15bfe22ce4fac9960a1066a2b721e54fb - -commit 154d8baf631327163571760c2c524bc93c37567c -Author: Darren Tucker -Date: Mon Mar 27 12:22:30 2023 +1100 - - Also look for gdb error message from OpenIndiana. - -commit fbd3811ddb2b6ce2e6dba91fde7352c8978e5412 -Author: Darren Tucker -Date: Mon Mar 27 11:08:00 2023 +1100 - - Explicitly disable security key test on aix51 VM. - - We don't know how to build the shared objects required for the security - key tests so skip them. - -commit 4922ac3be8a996780ef3dc220411da2e27c29d9c -Author: Darren Tucker -Date: Sun Mar 26 14:49:43 2023 +1100 - - Split libcrypto and other config flags. - - This should allow the automatic OpenSSL version selection in the tests - to work better. - -commit 4a948b1469f185e871160a2d70e2a0fce2858f9e -Author: Darren Tucker -Date: Sun Mar 26 14:39:45 2023 +1100 - - Specify test target if we build without OpenSSL. - - When we decide we can't use the versions of OpenSSL available, also - restrict the tests we run to avoid the ones that need OpenSSL. - -commit b308c636f5b5d89eecb98be00b3d56306a005a09 -Author: Darren Tucker -Date: Sun Mar 26 14:22:53 2023 +1100 - - Find suitable OpenSSL version. - - Check the installed OpenSSL versions for a suitable one, and if there - isn't (and we don't have a specific version configured) then build - without OpenSSL. - -commit 021ea5c2860f133f44790970968e0e73208b3a87 -Author: Damien Miller -Date: Fri Mar 24 15:02:52 2023 +1100 - - Github testing support for BoringSSL - -commit 9a97cd106466a2a9bda2bfaa4c48c4f1b2cc9c1b -Author: Damien Miller -Date: Fri Mar 24 15:34:29 2023 +1100 - - BoringSSL doesn't support EC_POINT_point2bn() - - so don't invoke it in unittest - -commit cc5969c033a032d126ff78e5d95cf20abbede4c7 -Author: Damien Miller -Date: Fri Mar 24 15:34:05 2023 +1100 - - another ERR_load_CRYPTO_strings() vestige - -commit 4974293899a068133e976f81d6693670d2b576ca -Author: Damien Miller -Date: Fri Mar 24 15:24:05 2023 +1100 - - don't use obsolete ERR_load_CRYPTO_strings() - - OpenSSL (and elsewhere in OpenSSH) uses ERR_load_crypto_strings() - -commit 3c527d55f906e6970d17c4cab6db90ae9e013235 -Author: Damien Miller -Date: Fri Mar 24 15:23:05 2023 +1100 - - Allow building with BoringSSL - -commit b7e27cfd7f163fc16b4c5d041cc28ee488a5eeec -Author: Damien Miller -Date: Fri Mar 24 15:21:18 2023 +1100 - - put back SSLeay_version compat in configure test - - Needed to detect old versions and give good "your version is bad" - messages at configure time; spotted by dtucker@ - -commit 7280401bdd77ca54be6867a154cc01e0d72612e0 -Author: Damien Miller -Date: Fri Mar 24 13:56:25 2023 +1100 - - remove support for old libcrypto - - OpenSSH now requires LibreSSL 3.1.0 or greater or - OpenSSL 1.1.1 or greater - - with/ok dtucker@ - -commit 9349d8244d62803f91295cd3aff5424b466c2a3e -Author: Chris Rapier -Date: Thu Mar 23 17:28:44 2023 -0400 - - checkpoint - that change redudes throughput on paths with delay - -commit ab0f7d94b7a17da30bdf5de5450a9fe96d95ccb5 -Author: Chris Rapier -Date: Thu Mar 23 17:25:51 2023 -0400 - - checkpoint - change SSHBUF_SIZE_MAX again to 16MB this time down from a max of 256MB - -commit 26839e65ee108a2fb809df14e9fef1c69cd3678c -Author: Chris Rapier -Date: Thu Mar 23 17:23:40 2023 -0400 - - checkpoint - change SSHBUF_SIZE_MAX again - -commit 6e8c76d453c153f8efeb6f0831f3ad8a02f8052f -Author: Chris Rapier -Date: Thu Mar 23 17:20:32 2023 -0400 - - checkpoint - change SSHBUF_SIZE_MAX - -commit 0f4fc94d47c6ebe1164876d84ebc2b1d017cc751 -Author: Chris Rapier -Date: Thu Mar 23 17:10:48 2023 -0400 - - checkpoint - -commit 57b080aa67b924142d5c6070fa90e7a0d0e9e09c -Author: Chris Rapier -Date: Thu Mar 23 17:03:58 2023 -0400 - - checkpoint - -commit 23c5960add584871f8d31923db80f42a7863621f -Author: Chris Rapier -Date: Thu Mar 23 16:12:49 2023 -0400 - - checkpoint - -commit eab20ce632a7e0fc7b67aaee520bc424e4076d33 -Author: Chris Rapier -Date: Thu Mar 23 16:10:24 2023 -0400 - - checkpoint - -commit 1fd7fe4ea0bf47362e6d351151932769cbaee96e -Author: Chris Rapier -Date: Thu Mar 23 15:47:29 2023 -0400 - - checkpoint - -commit 26139e2ba80cf3efcd6b9720232bc1ea27fb915e -Author: Chris Rapier -Date: Thu Mar 23 15:04:00 2023 -0400 - - checkpoint - -commit cb3069370c6d1d6a3066da515a1e8d4816d4b256 -Author: Chris Rapier -Date: Thu Mar 23 15:02:41 2023 -0400 - - checkpoint - -commit db7ac79bc61815dab0f0c8b8aac6bf007a568ff9 -Author: Chris Rapier -Date: Thu Mar 23 14:43:23 2023 -0400 - - Trying to reduce memory footprint. - -commit abda22fb48302f2142233f71d27c74040288c518 -Author: Darren Tucker -Date: Sun Mar 19 15:36:13 2023 +1100 - - Test latest OpenSSL 1.1, 3.0 and LibreSSL 3.7. - -commit 992e8ee31769a904c042a68884a0f13ee52a377a -Author: Chris Rapier -Date: Fri Mar 17 09:58:32 2023 -0400 - - crank version number. hpn17v12 - -commit 1df6f1684c40cd98fe52d956b756bc700ba2d5f7 -Author: Chris Rapier -Date: Fri Mar 17 09:32:41 2023 -0400 - - LibreSSL, as of version 3.7.1, now supports the EVP_CIPHER_meth_* functions so - we can go back to supporting it. These functions are necessary to support the - aes-ctr-mt functions. - -commit 40712a4678df25da917eb478d8940afafa3eb946 -Author: Chris Rapier -Date: Thu Mar 16 15:39:01 2023 -0400 - - Removed the CI tests that depend on selfhosted runners. We don't have those. - -commit f8ddc5380b1f128c2dd1092a0b95c9b0f4937c65 -Author: Chris Rapier -Date: Thu Mar 16 15:15:58 2023 -0400 - - Fixed an issue with the progressmeter. - -commit b80bd7d31ecd61a17e4f2e2e57c647c12ec07e2a -Merge: d4200c475 cb30fbdbe -Author: Chris Rapier -Date: Thu Mar 16 14:43:05 2023 -0400 - - This is the merge against the released version of OpenSSH 9.3 - -commit d4200c475417de2849e53e7d7990103c4f1519ed -Author: Chris Rapier -Date: Thu Mar 16 11:36:43 2023 -0400 - - Changed the cifuzz test to only run - for the master and pre-stage branches - -commit 610ac1cb077cd5a1ebfc21612154bfa13d2ec825 -Author: Darren Tucker -Date: Thu Mar 16 21:38:04 2023 +1100 - - Show 9.3 branch instead of 9.2. - -commit cb30fbdbee869f1ce11f06aa97e1cb8717a0b645 -Author: Damien Miller -Date: Thu Mar 16 08:28:19 2023 +1100 - - depend - -commit 1dba63eb10c40b6fda9f5012ed6ae87e2d3d028e -Author: Damien Miller -Date: Thu Mar 16 08:27:54 2023 +1100 - - crank version - -commit ba7532d0dac9aaf0ad7270664c43837fc9f64a5f -Author: djm@openbsd.org -Date: Wed Mar 15 21:19:57 2023 +0000 - - upstream: openssh-9.3 - - OpenBSD-Commit-ID: 8011495f2449c1029bb316bd015eab2e00509848 - -commit 7dac438bc32ed2364fa7270cf2f8ed4a6cf3f95d -Author: Chris Rapier -Date: Wed Mar 15 17:00:27 2023 -0400 - - First pass at porting hpnssh to the alpha release of 9.3 - -commit 6fd4daafb949b66bf555f3100f715a9ec64c3390 -Author: dtucker@openbsd.org -Date: Tue Mar 14 07:28:47 2023 +0000 - - upstream: Free KRL ptr in addition to its contents. - - From Coverity CID 291841, ok djm@ - - OpenBSD-Commit-ID: f146ba08b1b43af4e0d7ad8c4dae3748b4fa31b6 - -commit 1d270bd303afaf6d94e9098cbbf18e5e539e2088 -Author: dtucker@openbsd.org -Date: Tue Mar 14 07:26:25 2023 +0000 - - upstream: Check pointer for NULL before deref. - - None of the existing callers seem to do that, but it's worth checking. - From Coverity CID 291834, ok djm@ - - OpenBSD-Commit-ID: a0a97113f192a7cb1a2c97b932f677f573cda7a4 - -commit d95af508e78c0cd3dce56b83853baaa59ae295cf -Author: dtucker@openbsd.org -Date: Sun Mar 12 10:40:39 2023 +0000 - - upstream: Limit number of entries in SSH2_MSG_EXT_INFO - - request. This is already constrained by the maximum SSH packet size but this - makes it explicit. Prompted by Coverity CID 291868, ok djm@ markus@ - - OpenBSD-Commit-ID: aea023819aa44a2dcb9dd0fbec10561896fc3a09 - -commit 8f287ba60d342b3e2f750e7332d2131e3ec7ecd0 -Author: dtucker@openbsd.org -Date: Sun Mar 12 09:41:18 2023 +0000 - - upstream: calloc can return NULL but xcalloc can't. - - From Coverity CID 291881, ok djm@ - - OpenBSD-Commit-ID: 50204b755f66b2ec7ac3cfe379d07d85ca161d2b - -commit 83a56a49fd50f4acf900f934279482e4ef329715 -Author: dtucker@openbsd.org -Date: Fri Mar 10 07:17:08 2023 +0000 - - upstream: Explicitly ignore return from fcntl - - (... FD_CLOEXEC) here too. Coverity CID 291853. - - OpenBSD-Commit-ID: 99d8b3da9d0be1d07ca8dd8e98800a890349e9b5 - -commit 0fda9d704d3bbf54a5e64ce02a6fecb11fe7f047 -Author: Damien Miller -Date: Fri Mar 10 15:59:46 2023 +1100 - - bounds checking for getrrsetbyname() replacement; - - Spotted by Coverity in CID 405033; ok millert@ - -commit 89b8df518f21677045599df0ad3e5dd0f39909b5 -Author: dtucker@openbsd.org -Date: Fri Mar 10 04:06:21 2023 +0000 - - upstream: Plug mem leak on error path. Coverity CID 405026, ok djm@. - - OpenBSD-Commit-ID: 8212ca05d01966fb5e72205c592b2257708a2aac - -commit bf4dae0ad192c3e2f03f7223834b00d88ace3d3e -Author: Darren Tucker -Date: Fri Mar 10 14:46:57 2023 +1100 - - Add prototypes for mkstemp replacements. - - Should prevent warnings due to our wrapper function. - -commit 4e04d68d6a33cdc73b831fd4b5e6124175555d3d -Author: dtucker@openbsd.org -Date: Fri Mar 10 03:01:51 2023 +0000 - - upstream: Expliticly ignore return code from fcntl(.. FD_CLOEXEC) since - - there's not much we can do anyway. From Coverity CID 291857, ok djm@ - - OpenBSD-Commit-ID: 051429dd07af8db3fec10d82cdc78d90bb051729 - -commit d6d38fd77cbe091c59e1bb720c3a494df4990640 -Author: djm@openbsd.org -Date: Fri Mar 10 02:32:04 2023 +0000 - - upstream: Like sshd_config, some ssh_config options are not - - first-match-wins. sshd_config.5 was fixed in r1.348, this is the same for - this file - - OpenBSD-Commit-ID: 7be55b9351cde449b136afcc52d07aa4113b215e - -commit 7187d3f86bf8f2066cc9941f217d23b0cacae25e -Author: dtucker@openbsd.org -Date: Fri Mar 10 02:24:56 2023 +0000 - - upstream: Remove no-op (int) > INT_MAX checks - - since they can never be true. From Coverity CID 405031, ok djm@ - - OpenBSD-Commit-ID: 9df3783b181e056595e2bb9edf7ed41d61cf8e84 - -commit 77adde4305542ebe3005dd456122624fe2347b01 -Author: Darren Tucker -Date: Fri Mar 10 13:27:29 2023 +1100 - - Wrap mkstemp calls with umask set/restore. - - glibc versions 2.06 and earlier did not set a umask on files created by - mkstemp created the world-writable. Wrap mkstemp to set and restore - the umask. From Coverity (CIDs 291826 291886 291891), ok djm@ - -commit 633d3dc2a1e9e2a013d019a0576a0771c8423713 -Author: jcs@openbsd.org -Date: Thu Mar 9 21:06:24 2023 +0000 - - upstream: modify parentheses in conditionals to make it clearer what is - - being assigned and what is being checked - - ok djm dtucker - - OpenBSD-Commit-ID: 19c10baa46ae559474409f75a5cb3d0eade7a9b8 - -commit 733030840c4772f858de95d5940ec0c37663e8b0 -Author: dtucker@openbsd.org -Date: Thu Mar 9 07:11:05 2023 +0000 - - upstream: Re-split the merge of the reorder-hostkeys test. - - In the kex_proposal_populate_entries change I merged the the check for - reordering hostkeys with the actual reordering, but kex_assemble_names - mutates options.hostkeyalgorithms which renders the check ineffective. - Put the check back where it was. Spotted and tested by jsg@, ok djm@ - - OpenBSD-Commit-ID: a7469f25a738db5567395d1881e32479a7ffc9de - -commit 54ac4ab2b53ce9fcb66b8250dee91c070e4167ed -Author: djm@openbsd.org -Date: Thu Mar 9 06:58:26 2023 +0000 - - upstream: include destination constraints for smartcard keys too. - - Spotted by Luci Stanescu; ok deraadt@ markus@ - - OpenBSD-Commit-ID: add879fac6903a1cb1d1e42c4309e5359c3d870f - -commit bfd1ad01d974a316b60622759ad17537fa2d92b4 -Author: Darren Tucker -Date: Thu Mar 9 18:24:54 2023 +1100 - - Limit the number of PAM environment variables. - - xcalloc has its own limits, but these are specific to PAM. From - Coverity CID 405198, ok djm@ - -commit a231414970e01a35f45a295d5f93698fa1249b28 -Author: Darren Tucker -Date: Thu Mar 9 18:19:44 2023 +1100 - - Limit the number of PAM environment variables. - - From Coverity CID 405194, tweaks and ok djm@ - -commit 36c6c3eff5e4a669ff414b9daf85f919666e8e03 -Author: dtucker@openbsd.org -Date: Wed Mar 8 06:21:32 2023 +0000 - - upstream: Plug mem leak. Coverity CID 405196, ok djm@ - - OpenBSD-Commit-ID: 175f09349387c292f626da68f65f334faaa085f2 - -commit dfb9b736e1ccf9e6b03eea21cd961f4fd0634c98 -Author: tb@openbsd.org -Date: Wed Mar 8 05:33:53 2023 +0000 - - upstream: ssh-pkcs11: synchronize error messages with errors - - A handful of error messages contained incorrect function names or - otherwise inaccurate descriptions. Fix them to match reality. - - input/ok djm - - OpenBSD-Commit-ID: 165a15db52f75b31e1804b043480c36af09f3411 - -commit 51875897b81b5c21b80c256a29597916edbde454 -Author: guenther@openbsd.org -Date: Wed Mar 8 04:43:12 2023 +0000 - - upstream: Delete obsolete /* ARGSUSED */ lint comments. - - ok miod@ millert@ - - OpenBSD-Commit-ID: 7be168a570264d59e96a7d2d22e927d45fee0e4c - -commit a76085bda883c2104afb33ab0334eca190927362 -Author: Darren Tucker -Date: Wed Mar 8 17:25:37 2023 +1100 - - Extra brackets to prevent warning. - -commit 147ae57d4dfa0508109f93b78a7d8b92819e1f83 -Author: djm@openbsd.org -Date: Wed Mar 8 00:05:58 2023 +0000 - - upstream: use RSA/SHA256 when testing usability of private key in - - agent; with/ok dtucker - - OpenBSD-Commit-ID: fe1382e2fdf23fcae631308e72342bad56066a56 - -commit 27fd251bc906a763e70ce0f27c8abdf8bbd1e416 -Author: djm@openbsd.org -Date: Wed Mar 8 00:05:37 2023 +0000 - - upstream: use RSA/SHA256 when testing usability of private key; - - based on fix in bz3546 by Dmitry Belyavskiy; with/ok dtucker - - OpenBSD-Commit-ID: 0ef414cc363a832f9fab92a5da0234448bce2eba - -commit eee9f3fc3d52ae7d2106929bb06b7f291fb0b81a -Author: djm@openbsd.org -Date: Tue Mar 7 21:47:42 2023 +0000 - - upstream: refactor to be more readable top to bottom. Prompted by - - Coverity CID 405048 which was a false-positive fd leak; ok dtucker@ - - OpenBSD-Commit-ID: fc55ec2af622a017defb9b768bf26faefc792c00 - -commit 42a06b29a4c99272bf690f9b3be520b08b448dc5 -Author: Darren Tucker -Date: Tue Mar 7 18:34:41 2023 +1100 - - Add header changes missed in previous. - -commit 4710077096edff2e6926dd5b15bf586491d317db -Author: dtucker@openbsd.org -Date: Tue Mar 7 06:09:14 2023 +0000 - - upstream: Fix mem leak in environment setup. - - From jjelen at redhat.com via bz#2687, ok djm@ - - OpenBSD-Commit-ID: 9f9e4ba3cac003e6f81da3bcebd1b9ec43e7f353 - -commit 03acc50d0ccb78fc91d1570de1cd0fdfea646028 -Author: dtucker@openbsd.org -Date: Mon Mar 6 12:15:47 2023 +0000 - - upstream: Unit test for kex_proposal_populate_entries. - - OpenBSD-Regress-ID: bdb211d80d572a08bf14b49fe2a58b9ff265c006 - -commit 3f9231c2e1f374ebb08016ba00ea97b47c0ed20b -Author: djm@openbsd.org -Date: Tue Mar 7 05:37:26 2023 +0000 - - upstream: fix memory leak in process_read() path; Spotted by James - - Robinson in GHPR363; ok markus@ - - OpenBSD-Commit-ID: cdc2d98e6478b7e7f3a36976845adae3820429d8 - -commit c5e6e890839ec520ab9301a92cba56303749dea2 -Author: djm@openbsd.org -Date: Tue Mar 7 01:30:52 2023 +0000 - - upstream: correct size for array argument when changing - - UMAC_OUTPUT_LEN Coverity CID 291845; ok dtucker@ - - OpenBSD-Commit-ID: 2eb017d10705bb623d4418691f961c930eafaec0 - -commit 9641753e0fd146204d57b2a4165f552a81afade4 -Author: dtucker@openbsd.org -Date: Mon Mar 6 12:14:48 2023 +0000 - - upstream: Refactor creation of KEX proposal. - - This adds kex_proposal_populate_entries (and corresponding free) which - populates the KEX proposal array with dynamically allocated strings. - This replaces the previous mix of static and dynamic that has been the - source of previous leaks and bugs. Remove unused compat functions. - With & ok djm@. - - OpenBSD-Commit-ID: f2f99da4aae2233cb18bf9c749320c5e040a9c7b - -commit aa59d6a489fb20973fa461d0fdb1110db412947b -Author: dtucker@openbsd.org -Date: Sun Mar 5 09:24:35 2023 +0000 - - upstream: Fix mem and FILE leaks in moduli screening. - - If multiple -Ocheckpoint= options are passed, the earlier ones would - be overwritten and leaked. If we use an input file that wasn't stdin, - close that. From Coverity CIDs 291884 and 291894. - - OpenBSD-Commit-ID: a4d9d15f572926f841788912e2b282485ad09e8b - -commit 23b8cb41767af99a1aac24589d1882d9c8c2c205 -Author: dtucker@openbsd.org -Date: Sun Mar 5 08:18:58 2023 +0000 - - upstream: Plug mem leak in moduli checkpoint option parsing. - - From Coverity CID 291894. - - OpenBSD-Commit-ID: 9b1aba2d049741ae21c8dc4560a7e29ab17310f4 - -commit fc7f8f2188d4a4fc8ba77eddbe863c7665666db5 -Author: dtucker@openbsd.org -Date: Sun Mar 5 05:34:09 2023 +0000 - - upstream: Remove unused compat.h includes. - - We've previously removed a lot of the really old compatibility code, - and with it went the need to include compat.h in most of the files that - have it. - - OpenBSD-Commit-ID: 5af8baa194be00a3092d17598e88a5b29f7ea2b4 - -commit 6c165c36246d8004c20e1df5cec4961a5ac422d6 -Author: dtucker@openbsd.org -Date: Sat Mar 4 03:22:59 2023 +0000 - - upstream: Use time_t for x11 timeout. - - Use time_t instead of u_int for remaining x11 timeout checks for 64bit - time_t safety. From Coverity CIDs 405197 and 405028, ok djm@ - - OpenBSD-Commit-ID: 356685bfa1fc3d81bd95722d3fc47101cc1a4972 - -commit 4a3918f51bd2d968387e7aa87e33b32c78077fb4 -Author: dtucker@openbsd.org -Date: Fri Mar 3 10:23:42 2023 +0000 - - upstream: Ensure ms_remain is always initialized - - similar to what we do in ssh_packet_write_wait. bz#2687, from jjelen - at redhat.com. - - OpenBSD-Commit-ID: a50e0541cf823f8d1c72f71ccde925d3dbe6dfac - -commit e44846a4487d2885ac7f2610be09b1e2bf52249b -Author: dtucker@openbsd.org -Date: Fri Mar 3 09:48:51 2023 +0000 - - upstream: Check for non-NULL before string - - comparison. From jjelen at redhat.com via bz#2687. - - OpenBSD-Commit-ID: 0d9b2e0cac88a311b5766b1aef737082583c285f - -commit eb3d71a33faa60f25001fb9f5fdfdfcda8594db5 -Author: Chris Rapier -Date: Fri Mar 3 16:12:35 2023 -0500 - - I had a buffer overflow, fencepost issue, the resume function in hpnscp. - Essentially, I needed one more byte for the arrays hashsum and test_hashsum. - This came up in the sanitize CI tests. - -commit 75dad7fafc700adecc41df8cc8c1da9cd51f445d -Author: Chris Rapier -Date: Fri Mar 3 15:53:31 2023 -0500 - - I never noticed this but the version string for hpnsshd -V never gave the - hpn version information. Minor thing but fixed. - -commit 1842d523fae63b862ce8e60725c9b606cddb86a6 -Author: djm@openbsd.org -Date: Fri Mar 3 05:00:34 2023 +0000 - - upstream: guard against getsockname(-1, ...) from Coverity CID - - 291832 - - OpenBSD-Commit-ID: e58d5227327917d189229b7f0b37d2780f360d5f - -commit 78571a5fe9847d40d7f220c92b707574ae9ec4ce -Author: djm@openbsd.org -Date: Fri Mar 3 04:36:20 2023 +0000 - - upstream: some options are not first-match-wins. Mention that there - - are exceptions at the start of the manpage and label some of them in the - option description. - - OpenBSD-Commit-ID: 3b74728446fa6fc8742769eeb8c3674e233e84c4 - -commit d1c1b3272e8895a96c4f5889bd6e07a8525bd9f1 -Author: djm@openbsd.org -Date: Fri Mar 3 04:34:49 2023 +0000 - - upstream: actually print "channeltimeout none" in config dump mode; - - spotted via Coverity CID 405022 - - OpenBSD-Commit-ID: b074b52bf138b75f08264e8da15880b29c7a630f - -commit 8bf61e95610b48192d4e1720cc15d9004617301d -Author: Darren Tucker -Date: Fri Mar 3 14:50:03 2023 +1100 - - Add Coverity badges. - -commit 93291bd723959adf462b1df958106cf07a7734dd -Author: dtucker@openbsd.org -Date: Fri Mar 3 03:12:24 2023 +0000 - - upstream: Check return values of dup2. Spotted by Coverity, ok djm@ - - OpenBSD-Commit-ID: 19fb1b53072826d00c67df677731d2f6c1dd602b - -commit e37261dff33af23f37202cfce0848d36f5c1055c -Author: dtucker@openbsd.org + This was missed after the file was updated, but nobody noticed it + until now. diff --git a/Makefile.in b/Makefile.in index 513e5f44819b..55d35ebc7e20 100644 --- a/Makefile.in +++ b/Makefile.in @@ -106,7 +106,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ libcrux-mlkem-mldsa.o ssh-mldsa-eddsa.o \ hmac.o ed25519.o ed25519-openssl.o \ kex.o kex-names.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ - kexgexc.o kexgexs.o \ + kexgexc.o kexgexs.o kexmlkem768ecdh.o \ kexsntrup761x25519.o kexmlkem768x25519.o sntrup761.o kexgen.o \ sftp-realpath.o platform-pledge.o platform-tracing.o platform-misc.o \ sshbuf-io.o misc-agent.o ssherr-libcrypto.o \ diff --git a/README.md b/README.md index 51c2bb45238a..9e99d0a48c1e 100644 --- a/README.md +++ b/README.md @@ -38,12 +38,8 @@ Detailed step by step instructions can be found at https://psc.edu/hpn-ssh-home/ HPNSSH is built using autoconf and make. It requires a working C compiler, standard library and headers. -<<<<<<< HEAD -``libcrypto`` from one of [LibreSSL](https://www.libressl.org/), [OpenSSL](https://www.openssl.org), [AWS-LC](https://github.com/aws/aws-lc) or [BoringSSL](https://github.com/google/boringssl) may also be used. OpenSSH may be built without either of these, but the resulting binaries will have only a subset of the cryptographic algorithms normally available. -======= ``libcrypto`` from either [LibreSSL](https://www.libressl.org/) or [OpenSSL](https://www.openssl.org) may also be used. HPN-SSH may be built without either of these, but the resulting binaries will have only a subset of the cryptographic algorithms normally available. The developers of HPN-SSH strongly suggest the use of OpenSSL 3.0 or higher to support the advanced cryptography methods used. ->>>>>>> bug-restrict-window-openssh10 [zlib](https://www.zlib.net/) is optional; without it transport compression is not supported. diff --git a/README.tun b/README.tun deleted file mode 100644 index 5e1cb074c2ee..000000000000 --- a/README.tun +++ /dev/null @@ -1,132 +0,0 @@ -How to use OpenSSH-based virtual private networks -------------------------------------------------- - -OpenSSH contains support for VPN tunneling using the tun(4) network -tunnel pseudo-device which is available on most platforms, either for -layer 2 or 3 traffic. - -The following brief instructions on how to use this feature use -a network configuration specific to the OpenBSD operating system. - -(1) Server: Enable support for SSH tunneling - -To enable the ssh server to accept tunnel requests from the client, you -have to add the following option to the ssh server configuration file -(/etc/ssh/sshd_config): - - PermitTunnel yes - -Restart the server or send the hangup signal (SIGHUP) to let the server -reread it's configuration. - -(2) Server: Restrict client access and assign the tunnel - -The OpenSSH server simply uses the file /root/.ssh/authorized_keys to -restrict the client to connect to a specified tunnel and to -automatically start the related interface configuration command. These -settings are optional but recommended: - - tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... reyk@openbsd.org - -(3) Client: Configure the local network tunnel interface - -Use the hostname.if(5) interface-specific configuration file to set up -the network tunnel configuration with OpenBSD. For example, use the -following configuration in /etc/hostname.tun0 to set up the layer 3 -tunnel on the client: - - inet 192.168.5.1 255.255.255.252 192.168.5.2 - -OpenBSD also supports layer 2 tunneling over the tun device by adding -the link0 flag: - - inet 192.168.1.78 255.255.255.0 192.168.1.255 link0 - -Layer 2 tunnels can be used in combination with an Ethernet bridge(4) -interface, like the following example for /etc/bridgename.bridge0: - - add tun0 - add sis0 - up - -(4) Client: Configure the OpenSSH client - -To establish tunnel forwarding for connections to a specified -remote host by default, use the following ssh client configuration for -the privileged user (in /root/.ssh/config): - - Host sshgateway - Tunnel yes - TunnelDevice 0:any - PermitLocalCommand yes - LocalCommand sh /etc/netstart tun0 - -A more complicated configuration is possible to establish a tunnel to -a remote host which is not directly accessible by the client. -The following example describes a client configuration to connect to -the remote host over two ssh hops in between. It uses the OpenSSH -ProxyCommand in combination with the nc(1) program to forward the final -ssh tunnel destination over multiple ssh sessions. - - Host access.somewhere.net - User puffy - Host dmzgw - User puffy - ProxyCommand ssh access.somewhere.net nc dmzgw 22 - Host sshgateway - Tunnel Ethernet - TunnelDevice 0:any - PermitLocalCommand yes - LocalCommand sh /etc/netstart tun0 - ProxyCommand ssh dmzgw nc sshgateway 22 - -The following network plan illustrates the previous configuration in -combination with layer 2 tunneling and Ethernet bridging. - -+--------+ ( ) +----------------------+ -| Client |------( Internet )-----| access.somewhere.net | -+--------+ ( ) +----------------------+ - : 192.168.1.78 | - :............................. +-------+ - Forwarded ssh connection : | dmzgw | - Layer 2 tunnel : +-------+ - : | - : | - : +------------+ - :......| sshgateway | - | +------------+ ---- real connection Bridge -> | +----------+ -... "virtual connection" [ X ]--------| somehost | -[X] switch +----------+ - 192.168.1.25 - -(5) Client: Connect to the server and establish the tunnel - -Finally connect to the OpenSSH server to establish the tunnel by using -the following command: - - ssh sshgateway - -It is also possible to tell the client to fork into the background after -the connection has been successfully established: - - ssh -f sshgateway true - -Without the ssh configuration done in step (4), it is also possible -to use the following command lines: - - ssh -fw 0:1 sshgateway true - ifconfig tun0 192.168.5.1 192.168.5.2 netmask 255.255.255.252 - -Using OpenSSH tunnel forwarding is a simple way to establish secure -and ad hoc virtual private networks. Possible fields of application -could be wireless networks or administrative VPN tunnels. - -Nevertheless, ssh tunneling requires some packet header overhead and -runs on top of TCP. It is still suggested to use the IP Security -Protocol (IPSec) for robust and permanent VPN connections and to -interconnect corporate networks. - - Reyk Floeter - -$OpenBSD: README.tun,v 1.4 2006/03/28 00:12:31 deraadt Exp $ diff --git a/auth.c b/auth.c index a0217a81180c..a4a37c11a0d8 100644 --- a/auth.c +++ b/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.164 2026/02/11 22:57:16 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.165 2026/07/21 06:17:42 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -480,7 +480,10 @@ getpwnamallow(struct ssh *ssh, const char *user) log_verbose_reset(); for (i = 0; i < options.num_log_verbose; i++) log_verbose_add(options.log_verbose[i]); + server_process_channel_timeouts(ssh); server_process_permitopen(ssh); + ssh_packet_set_rekey_limits(ssh, options.rekey_limit, + options.rekey_interval); #if defined(_AIX) && defined(HAVE_SETAUTHDB) aix_setauthdb(user); diff --git a/auth2-gss.c b/auth2-gss.c index 85251b7d0b57..9e9496e539f7 100644 --- a/auth2-gss.c +++ b/auth2-gss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-gss.c,v 1.41 2026/07/06 07:53:30 djm Exp $ */ +/* $OpenBSD: auth2-gss.c,v 1.42 2026/07/07 02:17:18 djm Exp $ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. @@ -215,8 +215,6 @@ input_gssapi_errtok(int type, uint32_t plen, struct ssh *ssh) { Authctxt *authctxt = ssh->authctxt; int r; - u_char *p; - size_t len; if (authctxt == NULL) fatal("No authentication or GSSAPI context"); diff --git a/auth2-hostbased.c b/auth2-hostbased.c index 8a1acdec3f7c..564a8d3cc823 100644 --- a/auth2-hostbased.c +++ b/auth2-hostbased.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-hostbased.c,v 1.57 2026/04/02 07:48:13 djm Exp $ */ +/* $OpenBSD: auth2-hostbased.c,v 1.58 2026/07/30 03:37:39 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -88,6 +88,12 @@ userauth_hostbased(struct ssh *ssh, const char *method) pkalg); goto done; } + if (match_pattern_list(pkalg, + options.hostbased_accepted_algos, 0) != 1) { + logit_f("signature algorithm %s not in " + "HostbasedAcceptedAlgorithms", pkalg); + goto done; + } if ((r = sshkey_from_blob(pkblob, blen, &key)) != 0) { error_fr(r, "key_from_blob"); goto done; @@ -102,11 +108,6 @@ userauth_hostbased(struct ssh *ssh, const char *method) "(received %s, expected %s)", sshkey_ssh_name(key), pkalg); goto done; } - if (match_pattern_list(pkalg, options.hostbased_accepted_algos, 0) != 1) { - logit_f("signature algorithm %s not in " - "HostbasedAcceptedAlgorithms", pkalg); - goto done; - } if ((r = sshkey_check_cert_sigtype(key, options.ca_sign_algorithms)) != 0) { logit_fr(r, "certificate signature algorithm %s", diff --git a/auth2-pubkey.c b/auth2-pubkey.c index e446ef4122b2..c15b1ba71354 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.126 2026/04/02 07:48:13 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.127 2026/07/30 03:37:39 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved. @@ -140,6 +140,11 @@ userauth_pubkey(struct ssh *ssh, const char *method) verbose_f("unsupported public key algorithm: %s", pkalg); goto done; } + if (match_pattern_list(pkalg, options.pubkey_accepted_algos, 0) != 1) { + logit_f("signature algorithm %s not in " + "PubkeyAcceptedAlgorithms", pkalg); + goto done; + } if ((r = sshkey_from_blob(pkblob, blen, &key)) != 0) { error_fr(r, "parse key"); goto done; @@ -158,11 +163,6 @@ userauth_pubkey(struct ssh *ssh, const char *method) logit("refusing previously-used %s key", sshkey_type(key)); goto done; } - if (match_pattern_list(pkalg, options.pubkey_accepted_algos, 0) != 1) { - logit_f("signature algorithm %s not in " - "PubkeyAcceptedAlgorithms", pkalg); - goto done; - } if ((r = sshkey_check_cert_sigtype(key, options.ca_sign_algorithms)) != 0) { logit_fr(r, "certificate signature algorithm %s", diff --git a/authfile.c b/authfile.c index 954f78c001b7..be241059901b 100644 --- a/authfile.c +++ b/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.151 2026/06/29 09:14:25 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.152 2026/07/07 04:04:16 djm Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -207,7 +207,7 @@ sshkey_try_load_public(struct sshkey **kp, const char *filename, *commentp = NULL; if ((f = fopen(filename, "r")) == NULL) return SSH_ERR_SYSTEM_ERROR; - if (stat(filename, &st) == 0 && S_ISREG(st.st_mode) && + if (fstat(fileno(f), &st) == 0 && S_ISREG(st.st_mode) && st.st_size > SSHBUF_SIZE_MAX) { fclose(f); return SSH_ERR_INVALID_FORMAT; diff --git a/config.h.in b/config.h.in new file mode 100644 index 000000000000..17d4a68a10f9 --- /dev/null +++ b/config.h.in @@ -0,0 +1,2105 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + +/* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address + */ +#undef AIX_GETNAMEINFO_HACK + +/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */ +#undef AIX_LOGINFAILED_4ARG + +/* System only supports IPv4 audit records */ +#undef AU_IPv4 + +/* Define if your resolver libs need this for getrrsetbyname */ +#undef BIND_8_COMPAT + +/* The system has incomplete BSM API */ +#undef BROKEN_BSM_API + +/* broken in chroots on older kernels */ +#undef BROKEN_CLOSEFROM + +/* Define if cmsg_type is not passed correctly */ +#undef BROKEN_CMSG_TYPE + +/* getaddrinfo is broken (if present) */ +#undef BROKEN_GETADDRINFO + +/* getgroups(0,NULL) will return -1 */ +#undef BROKEN_GETGROUPS + +/* getline is not what we expect */ +#undef BROKEN_GETLINE + +/* Do not use system glob */ +#undef BROKEN_GLOB + +/* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */ +#undef BROKEN_INET_NTOA + +/* Define if your struct dirent expects you to allocate extra space for d_name + */ +#undef BROKEN_ONE_BYTE_DIRENT_D_NAME + +/* System poll(2) implementation is broken */ +#undef BROKEN_POLL + +/* Can't do comparisons on readv */ +#undef BROKEN_READV_COMPARISON + +/* NetBSD read function is sometimes redirected, breaking atomicio comparisons + against it */ +#undef BROKEN_READ_COMPARISON + +/* Needed for NeXT */ +#undef BROKEN_SAVED_UIDS + +/* Define if your setregid() is broken */ +#undef BROKEN_SETREGID + +/* Define if your setresgid() is broken */ +#undef BROKEN_SETRESGID + +/* Define if your setresuid() is broken */ +#undef BROKEN_SETRESUID + +/* Define if your setreuid() is broken */ +#undef BROKEN_SETREUID + +/* LynxOS has broken setvbuf() implementation */ +#undef BROKEN_SETVBUF + +/* QNX shadow support is broken */ +#undef BROKEN_SHADOW_EXPIRE + +/* Define if your snprintf is busted */ +#undef BROKEN_SNPRINTF + +/* strndup broken, see APAR IY61211 */ +#undef BROKEN_STRNDUP + +/* strnlen broken, see APAR IY62551 */ +#undef BROKEN_STRNLEN + +/* strnvis detected broken */ +#undef BROKEN_STRNVIS + +/* tcgetattr with ICANON may hang */ +#undef BROKEN_TCGETATTR_ICANON + +/* updwtmpx is broken (if present) */ +#undef BROKEN_UPDWTMPX + +/* Define if you have BSD auth support */ +#undef BSD_AUTH + +/* Define if you want to specify the path to your lastlog file */ +#undef CONF_LASTLOG_FILE + +/* Define if you want to specify the path to your utmp file */ +#undef CONF_UTMP_FILE + +/* Define if you want to specify the path to your wtmpx file */ +#undef CONF_WTMPX_FILE + +/* Define if you want to specify the path to your wtmp file */ +#undef CONF_WTMP_FILE + +/* Need to call setpgrp as root */ +#undef DISABLE_FD_PASSING + +/* Define if you don't want to use lastlog */ +#undef DISABLE_LASTLOG + +/* Define if you don't want to use your system's login() call */ +#undef DISABLE_LOGIN + +/* Define if you don't want to use pututline() etc. to write [uw]tmp */ +#undef DISABLE_PUTUTLINE + +/* Define if you don't want to use pututxline() etc. to write [uw]tmpx */ +#undef DISABLE_PUTUTXLINE + +/* Define if you want to disable shadow passwords */ +#undef DISABLE_SHADOW + +/* Define if you don't want to use utmp */ +#undef DISABLE_UTMP + +/* Define if you don't want to use utmpx */ +#undef DISABLE_UTMPX + +/* Define if you don't want to use wtmp */ +#undef DISABLE_WTMP + +/* Define if you don't want to use wtmpx */ +#undef DISABLE_WTMPX + +/* Enable for PKCS#11 support */ +#undef ENABLE_PKCS11 + +/* Enable for U2F/FIDO support */ +#undef ENABLE_SK + +/* Enable for built-in U2F/FIDO support */ +#undef ENABLE_SK_INTERNAL + +/* define if fflush(NULL) does not work */ +#undef FFLUSH_NULL_BUG + +/* File names may not contain backslash characters */ +#undef FILESYSTEM_NO_BACKSLASH + +/* fsid_t has member val */ +#undef FSID_HAS_VAL + +/* fsid_t has member __val */ +#undef FSID_HAS___VAL + +/* getpgrp takes one arg */ +#undef GETPGRP_VOID + +/* Conflicting defs for getspnam */ +#undef GETSPNAM_CONFLICTING_DEFS + +/* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */ +#undef GLOB_HAS_ALTDIRFUNC + +/* Define if your system glob() function has gl_matchc options in glob_t */ +#undef GLOB_HAS_GL_MATCHC + +/* Define if your system glob() function has gl_statv options in glob_t */ +#undef GLOB_HAS_GL_STATV + +/* Define this if you want GSSAPI support in the version 2 protocol */ +#undef GSSAPI + +/* Define if you want to use shadow password expire field */ +#undef HAS_SHADOW_EXPIRE + +/* Define if your system uses access rights style file descriptor passing */ +#undef HAVE_ACCRIGHTS_IN_MSGHDR + +/* Define if you have ut_addr in utmp.h */ +#undef HAVE_ADDR_IN_UTMP + +/* Define if you have ut_addr in utmpx.h */ +#undef HAVE_ADDR_IN_UTMPX + +/* Define if you have ut_addr_v6 in utmp.h */ +#undef HAVE_ADDR_V6_IN_UTMP + +/* Define if you have ut_addr_v6 in utmpx.h */ +#undef HAVE_ADDR_V6_IN_UTMPX + +/* Define to 1 if you have the `arc4random' function. */ +#undef HAVE_ARC4RANDOM + +/* Define to 1 if you have the `arc4random_buf' function. */ +#undef HAVE_ARC4RANDOM_BUF + +/* Define to 1 if you have the `arc4random_stir' function. */ +#undef HAVE_ARC4RANDOM_STIR + +/* Define to 1 if you have the `arc4random_uniform' function. */ +#undef HAVE_ARC4RANDOM_UNIFORM + +/* Define to 1 if you have the `asprintf' function. */ +#undef HAVE_ASPRINTF + +/* OpenBSD's gcc has bounded */ +#undef HAVE_ATTRIBUTE__BOUNDED__ + +/* Have attribute nonnull */ +#undef HAVE_ATTRIBUTE__NONNULL__ + +/* compiler supports nonstring attribute */ +#undef HAVE_ATTRIBUTE__NONSTRING__ + +/* OpenBSD's gcc has sentinel */ +#undef HAVE_ATTRIBUTE__SENTINEL__ + +/* Define to 1 if you have the `aug_get_machine' function. */ +#undef HAVE_AUG_GET_MACHINE + +/* Define to 1 if you have the `auth_hostok' function. */ +#undef HAVE_AUTH_HOSTOK + +/* Define to 1 if you have the `auth_timeok' function. */ +#undef HAVE_AUTH_TIMEOK + +/* Define to 1 if you have the `b64_ntop' function. */ +#undef HAVE_B64_NTOP + +/* Define to 1 if you have the `b64_pton' function. */ +#undef HAVE_B64_PTON + +/* Define if you have the basename function. */ +#undef HAVE_BASENAME + +/* Define to 1 if you have the `bcopy' function. */ +#undef HAVE_BCOPY + +/* Define to 1 if you have the `bcrypt_pbkdf' function. */ +#undef HAVE_BCRYPT_PBKDF + +/* Define to 1 if you have the `bindresvport_sa' function. */ +#undef HAVE_BINDRESVPORT_SA + +/* Define to 1 if you have the `blf_enc' function. */ +#undef HAVE_BLF_ENC + +/* Define to 1 if you have the header file. */ +#undef HAVE_BLF_H + +/* Define to 1 if you have the `Blowfish_expand0state' function. */ +#undef HAVE_BLOWFISH_EXPAND0STATE + +/* Define to 1 if you have the `Blowfish_expandstate' function. */ +#undef HAVE_BLOWFISH_EXPANDSTATE + +/* Define to 1 if you have the `Blowfish_initstate' function. */ +#undef HAVE_BLOWFISH_INITSTATE + +/* Define to 1 if you have the `Blowfish_stream2word' function. */ +#undef HAVE_BLOWFISH_STREAM2WORD + +/* Define to 1 if you have the `BN_is_prime_ex' function. */ +#undef HAVE_BN_IS_PRIME_EX + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSD_LIBUTIL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSM_AUDIT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSTRING_H + +/* Define to 1 if you have the `bzero' function. */ +#undef HAVE_BZERO + +/* calloc(0, x) returns NULL */ +#undef HAVE_CALLOC + +/* Define if you have caph_cache_tzdata */ +#undef HAVE_CAPH_CACHE_TZDATA + +/* Define to 1 if you have the header file. */ +#undef HAVE_CAPSICUM_HELPERS_H + +/* Define to 1 if you have the `cap_rights_limit' function. */ +#undef HAVE_CAP_RIGHTS_LIMIT + +/* Define to 1 if you have the `clock' function. */ +#undef HAVE_CLOCK + +/* Have clock_gettime */ +#undef HAVE_CLOCK_GETTIME + +/* define if you have clock_t data type */ +#undef HAVE_CLOCK_T + +/* Define to 1 if you have the `closefrom' function. */ +#undef HAVE_CLOSEFROM + +/* Define to 1 if you have the `close_range' function. */ +#undef HAVE_CLOSE_RANGE + +/* Define if gai_strerror() returns const char * */ +#undef HAVE_CONST_GAI_STRERROR_PROTO + +/* Define if your system uses ancillary data style file descriptor passing */ +#undef HAVE_CONTROL_IN_MSGHDR + +/* Define to 1 if you have the `crypt' function. */ +#undef HAVE_CRYPT + +/* Define to 1 if you have the header file. */ +#undef HAVE_CRYPTO_SHA2_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CRYPT_H + +/* Define if you are on Cygwin */ +#undef HAVE_CYGWIN + +/* Define if your libraries define daemon() */ +#undef HAVE_DAEMON + +/* Define to 1 if you have the declaration of `AI_NUMERICSERV', and to 0 if + you don't. */ +#undef HAVE_DECL_AI_NUMERICSERV + +/* Define to 1 if you have the declaration of `authenticate', and to 0 if you + don't. */ +#undef HAVE_DECL_AUTHENTICATE + +/* Define to 1 if you have the declaration of `bzero', and to 0 if you don't. + */ +#undef HAVE_DECL_BZERO + +/* Define to 1 if you have the declaration of `ftruncate', and to 0 if you + don't. */ +#undef HAVE_DECL_FTRUNCATE + +/* Define to 1 if you have the declaration of `getentropy', and to 0 if you + don't. */ +#undef HAVE_DECL_GETENTROPY + +/* Define to 1 if you have the declaration of `getpeereid', and to 0 if you + don't. */ +#undef HAVE_DECL_GETPEEREID + +/* Define to 1 if you have the declaration of `GLOB_NOMATCH', and to 0 if you + don't. */ +#undef HAVE_DECL_GLOB_NOMATCH + +/* Define to 1 if you have the declaration of `GSS_C_NT_HOSTBASED_SERVICE', + and to 0 if you don't. */ +#undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE + +/* Define to 1 if you have the declaration of `howmany', and to 0 if you + don't. */ +#undef HAVE_DECL_HOWMANY + +/* Define to 1 if you have the declaration of `htobe32', and to 0 if you + don't. */ +#undef HAVE_DECL_HTOBE32 + +/* Define to 1 if you have the declaration of `htole64', and to 0 if you + don't. */ +#undef HAVE_DECL_HTOLE64 + +/* Define to 1 if you have the declaration of `h_errno', and to 0 if you + don't. */ +#undef HAVE_DECL_H_ERRNO + +/* Define to 1 if you have the declaration of `INFINITY', and to 0 if you + don't. */ +#undef HAVE_DECL_INFINITY + +/* Define to 1 if you have the declaration of `le32toh', and to 0 if you + don't. */ +#undef HAVE_DECL_LE32TOH + +/* Define to 1 if you have the declaration of `le64toh', and to 0 if you + don't. */ +#undef HAVE_DECL_LE64TOH + +/* Define to 1 if you have the declaration of `loginfailed', and to 0 if you + don't. */ +#undef HAVE_DECL_LOGINFAILED + +/* Define to 1 if you have the declaration of `loginrestrictions', and to 0 if + you don't. */ +#undef HAVE_DECL_LOGINRESTRICTIONS + +/* Define to 1 if you have the declaration of `loginsuccess', and to 0 if you + don't. */ +#undef HAVE_DECL_LOGINSUCCESS + +/* Define to 1 if you have the declaration of `MAXSYMLINKS', and to 0 if you + don't. */ +#undef HAVE_DECL_MAXSYMLINKS + +/* Define to 1 if you have the declaration of `memmem', and to 0 if you don't. + */ +#undef HAVE_DECL_MEMMEM + +/* Define to 1 if you have the declaration of `NFDBITS', and to 0 if you + don't. */ +#undef HAVE_DECL_NFDBITS + +/* Define to 1 if you have the declaration of `offsetof', and to 0 if you + don't. */ +#undef HAVE_DECL_OFFSETOF + +/* Define to 1 if you have the declaration of `O_NONBLOCK', and to 0 if you + don't. */ +#undef HAVE_DECL_O_NONBLOCK + +/* Define to 1 if you have the declaration of `passwdexpired', and to 0 if you + don't. */ +#undef HAVE_DECL_PASSWDEXPIRED + +/* Define to 1 if you have the declaration of `readv', and to 0 if you don't. + */ +#undef HAVE_DECL_READV + +/* Define to 1 if you have the declaration of `setauthdb', and to 0 if you + don't. */ +#undef HAVE_DECL_SETAUTHDB + +/* Define to 1 if you have the declaration of `SHUT_RD', and to 0 if you + don't. */ +#undef HAVE_DECL_SHUT_RD + +/* Define to 1 if you have the declaration of `UINT32_MAX', and to 0 if you + don't. */ +#undef HAVE_DECL_UINT32_MAX + +/* Define to 1 if you have the declaration of `writev', and to 0 if you don't. + */ +#undef HAVE_DECL_WRITEV + +/* Define to 1 if you have the declaration of `_getlong', and to 0 if you + don't. */ +#undef HAVE_DECL__GETLONG + +/* Define to 1 if you have the declaration of `_getshort', and to 0 if you + don't. */ +#undef HAVE_DECL__GETSHORT + +/* Define to 1 if you have the declaration of `__builtin_inff', and to 0 if + you don't. */ +#undef HAVE_DECL___BUILTIN_INFF + +/* Define to 1 if you have the `DES_crypt' function. */ +#undef HAVE_DES_CRYPT + +/* Define if you have /dev/ptmx */ +#undef HAVE_DEV_PTMX + +/* Define if you have /dev/ptc */ +#undef HAVE_DEV_PTS_AND_PTC + +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you have the `dirfd' function. */ +#undef HAVE_DIRFD + +/* Define to 1 if you have the `dirname' function. */ +#undef HAVE_DIRNAME + +/* Define to 1 if you have the `dlopen' function. */ +#undef HAVE_DLOPEN + +/* Define to 1 if you have the `EC_KEY_METHOD_new' function. */ +#undef HAVE_EC_KEY_METHOD_NEW + +/* Define to 1 if you have the `EC_POINT_get_affine_coordinates' function. */ +#undef HAVE_EC_POINT_GET_AFFINE_COORDINATES + +/* Define to 1 if you have the `EC_POINT_get_affine_coordinates_GFp' function. + */ +#undef HAVE_EC_POINT_GET_AFFINE_COORDINATES_GFP + +/* Define to 1 if you have the `EC_POINT_set_affine_coordinates' function. */ +#undef HAVE_EC_POINT_SET_AFFINE_COORDINATES + +/* Define to 1 if you have the `EC_POINT_set_affine_coordinates_GFp' function. + */ +#undef HAVE_EC_POINT_SET_AFFINE_COORDINATES_GFP + +/* Define to 1 if you have the header file. */ +#undef HAVE_ELF_H + +/* Define to 1 if you have the `endgrent' function. */ +#undef HAVE_ENDGRENT + +/* Define to 1 if you have the header file. */ +#undef HAVE_ENDIAN_H + +/* Define to 1 if you have the `endutent' function. */ +#undef HAVE_ENDUTENT + +/* Define to 1 if you have the `endutxent' function. */ +#undef HAVE_ENDUTXENT + +/* Define to 1 if you have the `err' function. */ +#undef HAVE_ERR + +/* Define to 1 if you have the `errx' function. */ +#undef HAVE_ERRX + +/* Define to 1 if you have the header file. */ +#undef HAVE_ERR_H + +/* Define if your system has /etc/default/login */ +#undef HAVE_ETC_DEFAULT_LOGIN + +/* Define to 1 if you have the `EVP_chacha20' function. */ +#undef HAVE_EVP_CHACHA20 + +/* Define to 1 if you have the `EVP_CIPHER_CTX_get_iv' function. */ +#undef HAVE_EVP_CIPHER_CTX_GET_IV + +/* Define to 1 if you have the `EVP_CIPHER_CTX_get_updated_iv' function. */ +#undef HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV + +/* Define to 1 if you have the `EVP_CIPHER_CTX_iv' function. */ +#undef HAVE_EVP_CIPHER_CTX_IV + +/* Define to 1 if you have the `EVP_CIPHER_CTX_iv_noconst' function. */ +#undef HAVE_EVP_CIPHER_CTX_IV_NOCONST + +/* Define to 1 if you have the `EVP_CIPHER_CTX_set_iv' function. */ +#undef HAVE_EVP_CIPHER_CTX_SET_IV + +/* Define to 1 if you have the `EVP_DigestFinal_ex' function. */ +#undef HAVE_EVP_DIGESTFINAL_EX + +/* Define to 1 if you have the `EVP_DigestInit_ex' function. */ +#undef HAVE_EVP_DIGESTINIT_EX + +/* Define to 1 if you have the `EVP_DigestSign' function. */ +#undef HAVE_EVP_DIGESTSIGN + +/* Define to 1 if you have the `EVP_DigestVerify' function. */ +#undef HAVE_EVP_DIGESTVERIFY + +/* Define to 1 if you have the `EVP_MD_CTX_cleanup' function. */ +#undef HAVE_EVP_MD_CTX_CLEANUP + +/* Define to 1 if you have the `EVP_MD_CTX_copy_ex' function. */ +#undef HAVE_EVP_MD_CTX_COPY_EX + +/* Define to 1 if you have the `EVP_MD_CTX_init' function. */ +#undef HAVE_EVP_MD_CTX_INIT + +/* Define to 1 if you have the `EVP_PKEY_get_raw_private_key' function. */ +#undef HAVE_EVP_PKEY_GET_RAW_PRIVATE_KEY + +/* Define to 1 if you have the `EVP_PKEY_get_raw_public_key' function. */ +#undef HAVE_EVP_PKEY_GET_RAW_PUBLIC_KEY + +/* Define to 1 if you have the `EVP_sha256' function. */ +#undef HAVE_EVP_SHA256 + +/* Define to 1 if you have the `EVP_sha384' function. */ +#undef HAVE_EVP_SHA384 + +/* Define to 1 if you have the `EVP_sha512' function. */ +#undef HAVE_EVP_SHA512 + +/* Define if you have ut_exit in utmp.h */ +#undef HAVE_EXIT_IN_UTMP + +/* Define to 1 if you have the `explicit_bzero' function. */ +#undef HAVE_EXPLICIT_BZERO + +/* Define to 1 if you have the `explicit_memset' function. */ +#undef HAVE_EXPLICIT_MEMSET + +/* Define to 1 if you have the `fchmod' function. */ +#undef HAVE_FCHMOD + +/* Define to 1 if you have the `fchmodat' function. */ +#undef HAVE_FCHMODAT + +/* Define to 1 if you have the `fchown' function. */ +#undef HAVE_FCHOWN + +/* Define to 1 if you have the `fchownat' function. */ +#undef HAVE_FCHOWNAT + +/* Use F_CLOSEM fcntl for closefrom */ +#undef HAVE_FCNTL_CLOSEM + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if the system has the type `fd_mask'. */ +#undef HAVE_FD_MASK + +/* Define to 1 if you have the header file. */ +#undef HAVE_FEATURES_H + +/* Define to 1 if you have the `fido_assert_set_clientdata' function. */ +#undef HAVE_FIDO_ASSERT_SET_CLIENTDATA + +/* Define to 1 if you have the `fido_cred_prot' function. */ +#undef HAVE_FIDO_CRED_PROT + +/* Define to 1 if you have the `fido_cred_set_clientdata' function. */ +#undef HAVE_FIDO_CRED_SET_CLIENTDATA + +/* Define to 1 if you have the `fido_cred_set_prot' function. */ +#undef HAVE_FIDO_CRED_SET_PROT + +/* Define to 1 if you have the `fido_dev_get_touch_begin' function. */ +#undef HAVE_FIDO_DEV_GET_TOUCH_BEGIN + +/* Define to 1 if you have the `fido_dev_get_touch_status' function. */ +#undef HAVE_FIDO_DEV_GET_TOUCH_STATUS + +/* Define to 1 if you have the `fido_dev_is_winhello' function. */ +#undef HAVE_FIDO_DEV_IS_WINHELLO + +/* Define to 1 if you have the `fido_dev_supports_cred_prot' function. */ +#undef HAVE_FIDO_DEV_SUPPORTS_CRED_PROT + +/* Define to 1 if you have the header file. */ +#undef HAVE_FLOATINGPOINT_H + +/* Define to 1 if you have the `flock' function. */ +#undef HAVE_FLOCK + +/* Define to 1 if you have the `fmt_scaled' function. */ +#undef HAVE_FMT_SCALED + +/* Define to 1 if you have the `fnmatch' function. */ +#undef HAVE_FNMATCH + +/* Define to 1 if you have the header file. */ +#undef HAVE_FNMATCH_H + +/* Define to 1 if you have the `freeaddrinfo' function. */ +#undef HAVE_FREEADDRINFO + +/* Define to 1 if you have the `freezero' function. */ +#undef HAVE_FREEZERO + +/* Define to 1 if the system has the type `fsblkcnt_t'. */ +#undef HAVE_FSBLKCNT_T + +/* Define to 1 if the system has the type `fsfilcnt_t'. */ +#undef HAVE_FSFILCNT_T + +/* Define to 1 if you have the `fstatat' function. */ +#undef HAVE_FSTATAT + +/* Define to 1 if you have the `fstatfs' function. */ +#undef HAVE_FSTATFS + +/* Define to 1 if you have the `fstatvfs' function. */ +#undef HAVE_FSTATVFS + +/* Define to 1 if you have the `futimes' function. */ +#undef HAVE_FUTIMES + +/* Define to 1 if you have the `gai_strerror' function. */ +#undef HAVE_GAI_STRERROR + +/* Define to 1 if you have the `getaddrinfo' function. */ +#undef HAVE_GETADDRINFO + +/* Define to 1 if you have the `getaudit' function. */ +#undef HAVE_GETAUDIT + +/* Define to 1 if you have the `getaudit_addr' function. */ +#undef HAVE_GETAUDIT_ADDR + +/* Define to 1 if you have the `getcwd' function. */ +#undef HAVE_GETCWD + +/* Define to 1 if you have the `getentropy' function. */ +#undef HAVE_GETENTROPY + +/* Define to 1 if you have the `getgrouplist' function. */ +#undef HAVE_GETGROUPLIST + +/* Define to 1 if you have the `getgrset' function. */ +#undef HAVE_GETGRSET + +/* Define to 1 if you have the `getlastlogxbyname' function. */ +#undef HAVE_GETLASTLOGXBYNAME + +/* Define to 1 if you have the `getline' function. */ +#undef HAVE_GETLINE + +/* Define to 1 if you have the `getluid' function. */ +#undef HAVE_GETLUID + +/* Define to 1 if you have the `getnameinfo' function. */ +#undef HAVE_GETNAMEINFO + +/* Define to 1 if you have the `getopt' function. */ +#undef HAVE_GETOPT + +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define if your getopt(3) defines and uses optreset */ +#undef HAVE_GETOPT_OPTRESET + +/* Define if your libraries define getpagesize() */ +#undef HAVE_GETPAGESIZE + +/* Define to 1 if you have the `getpeereid' function. */ +#undef HAVE_GETPEEREID + +/* Define to 1 if you have the `getpeerucred' function. */ +#undef HAVE_GETPEERUCRED + +/* Define to 1 if you have the `getpgid' function. */ +#undef HAVE_GETPGID + +/* Define to 1 if you have the `getpgrp' function. */ +#undef HAVE_GETPGRP + +/* Define to 1 if you have the `getpwanam' function. */ +#undef HAVE_GETPWANAM + +/* Define to 1 if you have the `getrandom' function. */ +#undef HAVE_GETRANDOM + +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define if getrrsetbyname() exists */ +#undef HAVE_GETRRSETBYNAME + +/* Define to 1 if you have the `getseuserbyname' function. */ +#undef HAVE_GETSEUSERBYNAME + +/* Define to 1 if you have the `getsid' function. */ +#undef HAVE_GETSID + +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + +/* Define to 1 if you have the `getttyent' function. */ +#undef HAVE_GETTTYENT + +/* Define to 1 if you have the `getutent' function. */ +#undef HAVE_GETUTENT + +/* Define to 1 if you have the `getutid' function. */ +#undef HAVE_GETUTID + +/* Define to 1 if you have the `getutline' function. */ +#undef HAVE_GETUTLINE + +/* Define to 1 if you have the `getutxent' function. */ +#undef HAVE_GETUTXENT + +/* Define to 1 if you have the `getutxid' function. */ +#undef HAVE_GETUTXID + +/* Define to 1 if you have the `getutxline' function. */ +#undef HAVE_GETUTXLINE + +/* Define to 1 if you have the `getutxuser' function. */ +#undef HAVE_GETUTXUSER + +/* Define to 1 if you have the `get_default_context_with_level' function. */ +#undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + +/* Define to 1 if you have the `glob' function. */ +#undef HAVE_GLOB + +/* Define to 1 if you have the header file. */ +#undef HAVE_GLOB_H + +/* Define to 1 if you have the `group_from_gid' function. */ +#undef HAVE_GROUP_FROM_GID + +/* Define to 1 if you have the header file. */ +#undef HAVE_GSSAPI_GENERIC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GSSAPI_GSSAPI_GENERIC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GSSAPI_GSSAPI_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GSSAPI_GSSAPI_KRB5_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GSSAPI_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GSSAPI_KRB5_H + +/* Define if HEADER.ad exists in arpa/nameser.h */ +#undef HAVE_HEADER_AD + +/* Define to 1 if you have the `HMAC_CTX_init' function. */ +#undef HAVE_HMAC_CTX_INIT + +/* Define if you have ut_host in utmp.h */ +#undef HAVE_HOST_IN_UTMP + +/* Define if you have ut_host in utmpx.h */ +#undef HAVE_HOST_IN_UTMPX + +/* Define to 1 if you have the header file. */ +#undef HAVE_IAF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_IA_H + +/* Define if you have ut_id in utmp.h */ +#undef HAVE_ID_IN_UTMP + +/* Define if you have ut_id in utmpx.h */ +#undef HAVE_ID_IN_UTMPX + +/* Define to 1 if you have the header file. */ +#undef HAVE_IFADDRS_H + +/* Define to 1 if you have the `inet_aton' function. */ +#undef HAVE_INET_ATON + +/* Define to 1 if you have the `inet_ntoa' function. */ +#undef HAVE_INET_NTOA + +/* Define to 1 if you have the `inet_ntop' function. */ +#undef HAVE_INET_NTOP + +/* Define to 1 if you have the `innetgr' function. */ +#undef HAVE_INNETGR + +/* define if you have int64_t data type */ +#undef HAVE_INT64_T + +/* Define to 1 if the system has the type `intmax_t'. */ +#undef HAVE_INTMAX_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* define if you have intxx_t data type */ +#undef HAVE_INTXX_T + +/* Define to 1 if the system has the type `in_addr_t'. */ +#undef HAVE_IN_ADDR_T + +/* Define to 1 if the system has the type `in_port_t'. */ +#undef HAVE_IN_PORT_T + +/* Define if you have isblank(3C). */ +#undef HAVE_ISBLANK + +/* Define to 1 if you have the `killpg' function. */ +#undef HAVE_KILLPG + +/* Define to 1 if you have the `krb5_cc_new_unique' function. */ +#undef HAVE_KRB5_CC_NEW_UNIQUE + +/* Define to 1 if you have the `krb5_free_error_message' function. */ +#undef HAVE_KRB5_FREE_ERROR_MESSAGE + +/* Define to 1 if you have the `krb5_get_error_message' function. */ +#undef HAVE_KRB5_GET_ERROR_MESSAGE + +/* Define to 1 if you have the header file. */ +#undef HAVE_LANGINFO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LASTLOG_H + +/* Define if you want ldns support */ +#undef HAVE_LDNS + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBAUDIT_H + +/* Define to 1 if you have the `bsm' library (-lbsm). */ +#undef HAVE_LIBBSM + +/* Define to 1 if you have the `dl' library (-ldl). */ +#undef HAVE_LIBDL + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBGEN_H + +/* Define if system has libiaf that supports set_id */ +#undef HAVE_LIBIAF + +/* Define to 1 if you have the `network' library (-lnetwork). */ +#undef HAVE_LIBNETWORK + +/* Define to 1 if you have the `pam' library (-lpam). */ +#undef HAVE_LIBPAM + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBPROC_H + +/* Define to 1 if you have the `socket' library (-lsocket). */ +#undef HAVE_LIBSOCKET + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBUTIL_H + +/* Define to 1 if you have the `xnet' library (-lxnet). */ +#undef HAVE_LIBXNET + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_AUDIT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_FILTER_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_IF_TUN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_SECCOMP_H + +/* Define to 1 if you have the `llabs' function. */ +#undef HAVE_LLABS + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if you have the `login' function. */ +#undef HAVE_LOGIN + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOGIN_CAP_H + +/* Define to 1 if you have the `login_getcapbool' function. */ +#undef HAVE_LOGIN_GETCAPBOOL + +/* Define to 1 if you have the `login_getpwclass' function. */ +#undef HAVE_LOGIN_GETPWCLASS + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOGIN_H + +/* Define to 1 if you have the `logout' function. */ +#undef HAVE_LOGOUT + +/* Define to 1 if you have the `logwtmp' function. */ +#undef HAVE_LOGWTMP + +/* Define to 1 if the system has the type `long double'. */ +#undef HAVE_LONG_DOUBLE + +/* Define to 1 if the system has the type `long long'. */ +#undef HAVE_LONG_LONG + +/* Define to 1 if you have the header file. */ +#undef HAVE_MAILLOCK_H + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the `mblen' function. */ +#undef HAVE_MBLEN + +/* Define to 1 if you have the `mbtowc' function. */ +#undef HAVE_MBTOWC + +/* Define to 1 if you have the `memmem' function. */ +#undef HAVE_MEMMEM + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the `memset_s' function. */ +#undef HAVE_MEMSET_S + +/* Define to 1 if you have the `mkdtemp' function. */ +#undef HAVE_MKDTEMP + +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP + +/* define if you have mode_t data type */ +#undef HAVE_MODE_T + +/* Some systems put nanosleep outside of libc */ +#undef HAVE_NANOSLEEP + +/* Define to 1 if you have the header file. */ +#undef HAVE_NDIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETGROUP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_TUN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_ROUTE_H + +/* Define if you are on NeXT */ +#undef HAVE_NEXT + +/* Define to 1 if the system has the type `nfds_t'. */ +#undef HAVE_NFDS_T + +/* Define to 1 if you have the `ngetaddrinfo' function. */ +#undef HAVE_NGETADDRINFO + +/* Define to 1 if you have the `nlist' function. */ +#undef HAVE_NLIST + +/* Define to 1 if you have the header file. */ +#undef HAVE_NLIST_H + +/* Define to 1 if you have the `nl_langinfo' function. */ +#undef HAVE_NL_LANGINFO + +/* Define to 1 if you have the `nsleep' function. */ +#undef HAVE_NSLEEP + +/* Define to 1 if you have the `ogetaddrinfo' function. */ +#undef HAVE_OGETADDRINFO + +/* Define if you have an old version of PAM which takes only one argument to + pam_strerror */ +#undef HAVE_OLD_PAM + +/* Define to 1 if you have the `openlog_r' function. */ +#undef HAVE_OPENLOG_R + +/* Define to 1 if you have the `openpty' function. */ +#undef HAVE_OPENPTY + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CONFIGURATION_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_OPENSSLCONF_H + +/* Define to 1 if you have the `OpenSSL_version' function. */ +#undef HAVE_OPENSSL_VERSION + +/* Define to 1 if you have the `OpenSSL_version_num' function. */ +#undef HAVE_OPENSSL_VERSION_NUM + +/* Define if you have Digital Unix Security Integration Architecture */ +#undef HAVE_OSF_SIA + +/* Define to 1 if you have the `pam_getenvlist' function. */ +#undef HAVE_PAM_GETENVLIST + +/* Define to 1 if you have the header file. */ +#undef HAVE_PAM_PAM_APPL_H + +/* Define to 1 if you have the `pam_putenv' function. */ +#undef HAVE_PAM_PUTENV + +/* Define to 1 if you have the header file. */ +#undef HAVE_PATHS_H + +/* Define if you have ut_pid in utmp.h */ +#undef HAVE_PID_IN_UTMP + +/* define if you have pid_t data type */ +#undef HAVE_PID_T + +/* Define to 1 if you have the `pledge' function. */ +#undef HAVE_PLEDGE + +/* Define to 1 if you have the `poll' function. */ +#undef HAVE_POLL + +/* Define to 1 if you have the header file. */ +#undef HAVE_POLL_H + +/* Define to 1 if you have the `ppoll' function. */ +#undef HAVE_PPOLL + +/* Define to 1 if you have the `prctl' function. */ +#undef HAVE_PRCTL + +/* Define to 1 if you have the `priv_basicset' function. */ +#undef HAVE_PRIV_BASICSET + +/* Define to 1 if you have the header file. */ +#undef HAVE_PRIV_H + +/* Define to 1 if you have the `procctl' function. */ +#undef HAVE_PROCCTL + +/* Define if you have /proc/$pid/fd */ +#undef HAVE_PROC_PID + +/* Define to 1 if you have the `proc_pidinfo' function. */ +#undef HAVE_PROC_PIDINFO + +/* Define to 1 if you have the `pselect' function. */ +#undef HAVE_PSELECT + +/* Define to 1 if you have the `pstat' function. */ +#undef HAVE_PSTAT + +/* Define to 1 if you have the header file. */ +#undef HAVE_PTY_H + +/* Define to 1 if you have the `pututline' function. */ +#undef HAVE_PUTUTLINE + +/* Define to 1 if you have the `pututxline' function. */ +#undef HAVE_PUTUTXLINE + +/* Define to 1 if you have the `raise' function. */ +#undef HAVE_RAISE + +/* Define to 1 if you have the `readpassphrase' function. */ +#undef HAVE_READPASSPHRASE + +/* Define to 1 if you have the header file. */ +#undef HAVE_READPASSPHRASE_H + +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#undef HAVE_REALLOC + +/* Define to 1 if you have the `reallocarray' function. */ +#undef HAVE_REALLOCARRAY + +/* Define to 1 if you have the `realpath' function. */ +#undef HAVE_REALPATH + +/* Define to 1 if you have the `recallocarray' function. */ +#undef HAVE_RECALLOCARRAY + +/* Define to 1 if you have the `recvmsg' function. */ +#undef HAVE_RECVMSG + +/* sys/resource.h has RLIMIT_NPROC */ +#undef HAVE_RLIMIT_NPROC + +/* Define to 1 if you have the header file. */ +#undef HAVE_RPC_TYPES_H + +/* Define to 1 if you have the `rresvport_af' function. */ +#undef HAVE_RRESVPORT_AF + +/* Define to 1 if you have the `RSA_generate_key_ex' function. */ +#undef HAVE_RSA_GENERATE_KEY_EX + +/* Define to 1 if you have the `RSA_get_default_method' function. */ +#undef HAVE_RSA_GET_DEFAULT_METHOD + +/* Define to 1 if you have the header file. */ +#undef HAVE_SANDBOX_H + +/* Define to 1 if you have the `sandbox_init' function. */ +#undef HAVE_SANDBOX_INIT + +/* define if you have sa_family_t data type */ +#undef HAVE_SA_FAMILY_T + +/* Define to 1 if you have the `scan_scaled' function. */ +#undef HAVE_SCAN_SCALED + +/* Define if you have SecureWare-based protected password database */ +#undef HAVE_SECUREWARE + +/* Define to 1 if you have the header file. */ +#undef HAVE_SECURITY_PAM_APPL_H + +/* Define to 1 if you have the `sendmsg' function. */ +#undef HAVE_SENDMSG + +/* Define to 1 if you have the `setauthdb' function. */ +#undef HAVE_SETAUTHDB + +/* Define to 1 if you have the `setdtablesize' function. */ +#undef HAVE_SETDTABLESIZE + +/* Define to 1 if you have the `setegid' function. */ +#undef HAVE_SETEGID + +/* Define to 1 if you have the `setenv' function. */ +#undef HAVE_SETENV + +/* Define to 1 if you have the `seteuid' function. */ +#undef HAVE_SETEUID + +/* Define to 1 if you have the `setgroupent' function. */ +#undef HAVE_SETGROUPENT + +/* Define to 1 if you have the `setgroups' function. */ +#undef HAVE_SETGROUPS + +/* Define to 1 if you have the `setlinebuf' function. */ +#undef HAVE_SETLINEBUF + +/* Define to 1 if you have the `setlogin' function. */ +#undef HAVE_SETLOGIN + +/* Define to 1 if you have the `setluid' function. */ +#undef HAVE_SETLUID + +/* Define to 1 if you have the `setpassent' function. */ +#undef HAVE_SETPASSENT + +/* Define to 1 if you have the `setpcred' function. */ +#undef HAVE_SETPCRED + +/* Define to 1 if you have the `setpflags' function. */ +#undef HAVE_SETPFLAGS + +/* Define to 1 if you have the `setppriv' function. */ +#undef HAVE_SETPPRIV + +/* Define to 1 if you have the `setproctitle' function. */ +#undef HAVE_SETPROCTITLE + +/* Define to 1 if you have the `setregid' function. */ +#undef HAVE_SETREGID + +/* Define to 1 if you have the `setresgid' function. */ +#undef HAVE_SETRESGID + +/* Define to 1 if you have the `setresuid' function. */ +#undef HAVE_SETRESUID + +/* Define to 1 if you have the `setreuid' function. */ +#undef HAVE_SETREUID + +/* Define to 1 if you have the `setrlimit' function. */ +#undef HAVE_SETRLIMIT + +/* Define to 1 if you have the `setsid' function. */ +#undef HAVE_SETSID + +/* Define to 1 if you have the `setutent' function. */ +#undef HAVE_SETUTENT + +/* Define to 1 if you have the `setutxdb' function. */ +#undef HAVE_SETUTXDB + +/* Define to 1 if you have the `setutxent' function. */ +#undef HAVE_SETUTXENT + +/* Define to 1 if you have the `setvbuf' function. */ +#undef HAVE_SETVBUF + +/* Define to 1 if you have the `set_id' function. */ +#undef HAVE_SET_ID + +/* Define to 1 if you have the `SHA256Update' function. */ +#undef HAVE_SHA256UPDATE + +/* Define to 1 if you have the header file. */ +#undef HAVE_SHA2_H + +/* Define to 1 if you have the `SHA384Update' function. */ +#undef HAVE_SHA384UPDATE + +/* Define to 1 if you have the `SHA512Update' function. */ +#undef HAVE_SHA512UPDATE + +/* Define to 1 if you have the header file. */ +#undef HAVE_SHADOW_H + +/* Define to 1 if you have the `sigaction' function. */ +#undef HAVE_SIGACTION + +/* Define to 1 if the system has the type `sighandler_t'. */ +#undef HAVE_SIGHANDLER_T + +/* Define to 1 if you have the `sigvec' function. */ +#undef HAVE_SIGVEC + +/* Define to 1 if the system has the type `sig_atomic_t'. */ +#undef HAVE_SIG_ATOMIC_T + +/* define if you have size_t data type */ +#undef HAVE_SIZE_T + +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + +/* Define to 1 if you have the `socketpair' function. */ +#undef HAVE_SOCKETPAIR + +/* Have PEERCRED socket option */ +#undef HAVE_SO_PEERCRED + +/* define if you have ssize_t data type */ +#undef HAVE_SSIZE_T + +/* Fields in struct sockaddr_storage */ +#undef HAVE_SS_FAMILY_IN_SS + +/* Define if you have ut_ss in utmpx.h */ +#undef HAVE_SS_IN_UTMPX + +/* Define to 1 if you have the `statfs' function. */ +#undef HAVE_STATFS + +/* Define to 1 if you have the `statvfs' function. */ +#undef HAVE_STATVFS + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDDEF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strcasestr' function. */ +#undef HAVE_STRCASESTR + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + +/* Define to 1 if you have the `strftime' function. */ +#undef HAVE_STRFTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the `strmode' function. */ +#undef HAVE_STRMODE + +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP + +/* Define to 1 if you have the `strnlen' function. */ +#undef HAVE_STRNLEN + +/* Define to 1 if you have the `strnvis' function. */ +#undef HAVE_STRNVIS + +/* Define to 1 if you have the `strptime' function. */ +#undef HAVE_STRPTIME + +/* Define to 1 if you have the `strsep' function. */ +#undef HAVE_STRSEP + +/* Define to 1 if you have the `strsignal' function. */ +#undef HAVE_STRSIGNAL + +/* Define to 1 if you have the `strtoll' function. */ +#undef HAVE_STRTOLL + +/* Define to 1 if you have the `strtonum' function. */ +#undef HAVE_STRTONUM + +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL + +/* Define to 1 if you have the `strtoull' function. */ +#undef HAVE_STRTOULL + +/* define if you have struct addrinfo data type */ +#undef HAVE_STRUCT_ADDRINFO + +/* Define to 1 if `d_type' is a member of `struct dirent'. */ +#undef HAVE_STRUCT_DIRENT_D_TYPE + +/* define if you have struct in6_addr data type */ +#undef HAVE_STRUCT_IN6_ADDR + +/* Define to 1 if `pw_change' is a member of `struct passwd'. */ +#undef HAVE_STRUCT_PASSWD_PW_CHANGE + +/* Define to 1 if `pw_class' is a member of `struct passwd'. */ +#undef HAVE_STRUCT_PASSWD_PW_CLASS + +/* Define to 1 if `pw_expire' is a member of `struct passwd'. */ +#undef HAVE_STRUCT_PASSWD_PW_EXPIRE + +/* Define to 1 if `pw_gecos' is a member of `struct passwd'. */ +#undef HAVE_STRUCT_PASSWD_PW_GECOS + +/* Define to 1 if `fd' is a member of `struct pollfd'. */ +#undef HAVE_STRUCT_POLLFD_FD + +/* define if you have struct sockaddr_in6 data type */ +#undef HAVE_STRUCT_SOCKADDR_IN6 + +/* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */ +#undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID + +/* define if you have struct sockaddr_storage data type */ +#undef HAVE_STRUCT_SOCKADDR_STORAGE + +/* Define to 1 if `f_files' is a member of `struct statfs'. */ +#undef HAVE_STRUCT_STATFS_F_FILES + +/* Define to 1 if `f_flags' is a member of `struct statfs'. */ +#undef HAVE_STRUCT_STATFS_F_FLAGS + +/* Define to 1 if `st_blksize' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BLKSIZE + +/* Define to 1 if `st_mtim' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_MTIM + +/* Define to 1 if `st_mtime' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_MTIME + +/* define if you have struct timespec */ +#undef HAVE_STRUCT_TIMESPEC + +/* define if you have struct timeval */ +#undef HAVE_STRUCT_TIMEVAL + +/* Define to 1 if you have the `sysconf' function. */ +#undef HAVE_SYSCONF + +/* Define if you have syslen in utmpx.h */ +#undef HAVE_SYSLEN_IN_UTMPX + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_AUDIT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_BITYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_BSDTTY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_BYTEORDER_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_CAPSICUM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_CDEFS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_DIR_H + +/* Define if your system defines sys_errlist[] */ +#undef HAVE_SYS_ERRLIST + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_FILE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_LABEL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MOUNT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_NDIR_H + +/* Define if your system defines sys_nerr */ +#undef HAVE_SYS_NERR + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_POLL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PRCTL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PROCCTL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PSTAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PTMS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PTRACE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RANDOM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STATVFS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STREAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STROPTS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STRTIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSCTL_H + +/* Force use of sys/syslog.h on Ultrix */ +#undef HAVE_SYS_SYSLOG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSMACROS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIMERS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_VFS_H + +/* Define to 1 if you have the `tcgetpgrp' function. */ +#undef HAVE_TCGETPGRP + +/* Define to 1 if you have the `tcsendbreak' function. */ +#undef HAVE_TCSENDBREAK + +/* Define to 1 if you have the `time' function. */ +#undef HAVE_TIME + +/* Define to 1 if you have the `timegm' function. */ +#undef HAVE_TIMEGM + +/* Define to 1 if you have the header file. */ +#undef HAVE_TIME_H + +/* Define if you have ut_time in utmp.h */ +#undef HAVE_TIME_IN_UTMP + +/* Define if you have ut_time in utmpx.h */ +#undef HAVE_TIME_IN_UTMPX + +/* Define to 1 if you have the `timingsafe_bcmp' function. */ +#undef HAVE_TIMINGSAFE_BCMP + +/* Define to 1 if you have the header file. */ +#undef HAVE_TMPDIR_H + +/* Define to 1 if you have the `truncate' function. */ +#undef HAVE_TRUNCATE + +/* Define to 1 if you have the header file. */ +#undef HAVE_TTYENT_H + +/* Define if you have ut_tv in utmp.h */ +#undef HAVE_TV_IN_UTMP + +/* Define if you have ut_tv in utmpx.h */ +#undef HAVE_TV_IN_UTMPX + +/* Define if you have ut_type in utmp.h */ +#undef HAVE_TYPE_IN_UTMP + +/* Define if you have ut_type in utmpx.h */ +#undef HAVE_TYPE_IN_UTMPX + +/* Define to 1 if you have the header file. */ +#undef HAVE_UCRED_H + +/* Define to 1 if the system has the type `uintmax_t'. */ +#undef HAVE_UINTMAX_T + +/* define if you have uintxx_t data type */ +#undef HAVE_UINTXX_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the `unlinkat' function. */ +#undef HAVE_UNLINKAT + +/* Define to 1 if you have the `unsetenv' function. */ +#undef HAVE_UNSETENV + +/* Define to 1 if the system has the type `unsigned long long'. */ +#undef HAVE_UNSIGNED_LONG_LONG + +/* Define to 1 if you have the `unveil' function. */ +#undef HAVE_UNVEIL + +/* Define to 1 if you have the `updwtmp' function. */ +#undef HAVE_UPDWTMP + +/* Define to 1 if you have the `updwtmpx' function. */ +#undef HAVE_UPDWTMPX + +/* Define to 1 if you have the header file. */ +#undef HAVE_USERSEC_H + +/* Define to 1 if you have the `user_from_uid' function. */ +#undef HAVE_USER_FROM_UID + +/* Define to 1 if you have the `usleep' function. */ +#undef HAVE_USLEEP + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIL_H + +/* Define to 1 if you have the `utimensat' function. */ +#undef HAVE_UTIMENSAT + +/* Define to 1 if you have the `utimes' function. */ +#undef HAVE_UTIMES + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIME_H + +/* Define to 1 if you have the `utmpname' function. */ +#undef HAVE_UTMPNAME + +/* Define to 1 if you have the `utmpxname' function. */ +#undef HAVE_UTMPXNAME + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTMPX_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTMP_H + +/* define if you have u_char data type */ +#undef HAVE_U_CHAR + +/* define if you have u_int data type */ +#undef HAVE_U_INT + +/* define if you have u_int64_t data type */ +#undef HAVE_U_INT64_T + +/* define if you have u_intxx_t data type */ +#undef HAVE_U_INTXX_T + +/* Define to 1 if you have the `vasprintf' function. */ +#undef HAVE_VASPRINTF + +/* Define if va_copy exists */ +#undef HAVE_VA_COPY + +/* Define to 1 if you have the header file. */ +#undef HAVE_VIS_H + +/* Define to 1 if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF + +/* Define to 1 if you have the `waitpid' function. */ +#undef HAVE_WAITPID + +/* Define to 1 if you have the `warn' function. */ +#undef HAVE_WARN + +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + +/* Define to 1 if you have the `wcwidth' function. */ +#undef HAVE_WCWIDTH + +/* Define to 1 if you have the `_getlong' function. */ +#undef HAVE__GETLONG + +/* Define to 1 if you have the `_getpty' function. */ +#undef HAVE__GETPTY + +/* Define to 1 if you have the `_getshort' function. */ +#undef HAVE__GETSHORT + +/* Define if you have struct __res_state _res as an extern */ +#undef HAVE__RES_EXTERN + +/* Define to 1 if you have the `__b64_ntop' function. */ +#undef HAVE___B64_NTOP + +/* Define to 1 if you have the `__b64_pton' function. */ +#undef HAVE___B64_PTON + +/* Define if compiler implements __FUNCTION__ */ +#undef HAVE___FUNCTION__ + +/* Define if libc defines __progname */ +#undef HAVE___PROGNAME + +/* Fields in struct sockaddr_storage */ +#undef HAVE___SS_FAMILY_IN_SS + +/* Define if __va_copy exists */ +#undef HAVE___VA_COPY + +/* Define if compiler implements __func__ */ +#undef HAVE___func__ + +/* Define this if you are using the Heimdal version of Kerberos V5 */ +#undef HEIMDAL + +/* Define if you need to use IP address instead of hostname in $DISPLAY */ +#undef IPADDR_IN_DISPLAY + +/* Detect IPv4 in IPv6 mapped addresses and treat as IPv4 */ +#undef IPV4_IN_IPV6 + +/* Define if your system choked on IP TOS setting */ +#undef IP_TOS_IS_BROKEN + +/* Define if you want Kerberos 5 support */ +#undef KRB5 + +/* Define if pututxline updates lastlog too */ +#undef LASTLOG_WRITE_PUTUTXLINE + +/* Define to whatever link() returns for "not supported" if it doesn't return + EOPNOTSUPP. */ +#undef LINK_OPNOTSUPP_ERRNO + +/* Lock all memory to protect sshd against Linux kcompactd */ +#undef LINUX_MEMLOCK_ONFAULT + +/* Adjust Linux out-of-memory killer */ +#undef LINUX_OOM_ADJUST + +/* max value of long long calculated by configure */ +#undef LLONG_MAX + +/* min value of long long calculated by configure */ +#undef LLONG_MIN + +/* Account locked with pw(1) */ +#undef LOCKED_PASSWD_PREFIX + +/* String used in /etc/passwd to denote locked account */ +#undef LOCKED_PASSWD_STRING + +/* String used in /etc/passwd to denote locked account */ +#undef LOCKED_PASSWD_SUBSTR + +/* Some systems need a utmpx entry for /bin/login to work */ +#undef LOGIN_NEEDS_UTMPX + +/* Set this to your mail directory if you do not have _PATH_MAILDIR */ +#undef MAIL_DIRECTORY + +/* Define if your compiler lacks __builtin_popcount */ +#undef MISSING_BUILTIN_POPCOUNT + +/* Need setpgrp to for controlling tty */ +#undef NEED_SETPGRP + +/* compiler does not accept __attribute__ on prototype args */ +#undef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS + +/* compiler does not accept __attribute__ on return types */ +#undef NO_ATTRIBUTE_ON_RETURN_TYPE + +/* SA_RESTARTed signals do no interrupt select */ +#undef NO_SA_RESTART + +/* Define to disable UID restoration test */ +#undef NO_UID_RESTORATION_TEST + +/* Define if X11 doesn't support AF_UNIX sockets on that system */ +#undef NO_X11_UNIX_SOCKETS + +/* Define if EVP_DigestUpdate returns void */ +#undef OPENSSL_EVP_DIGESTUPDATE_VOID + +/* libcrypto has ed25519 support */ +#undef OPENSSL_HAS_ED25519 + +/* Define if you want the OpenSSL internally seeded PRNG only */ +#undef OPENSSL_PRNG_ONLY + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define if you are using Solaris-derived PAM which passes pam_messages to + the conversation function with an extra level of indirection */ +#undef PAM_SUN_CODEBASE + +/* Work around problematic Linux PAM modules handling of PAM_TTY */ +#undef PAM_TTY_KLUDGE + +/* must supply username to passwd */ +#undef PASSWD_NEEDS_USERNAME + +/* System dirs owned by bin (uid 2) */ +#undef PLATFORM_SYS_DIR_UID + +/* need inet in pledge for setsockopt IP_TOS */ +#undef PLEDGE_EXTRA_INET + +/* Define if poll 2nd arg is ulong */ +#undef POLL_NFDS_T_ULONG + +/* Port number of PRNGD/EGD random number socket */ +#undef PRNGD_PORT + +/* Location of PRNGD/EGD random number socket */ +#undef PRNGD_SOCKET + +/* read(1) can return 0 for a non-closed fd */ +#undef PTY_ZEROREAD + +/* Sandbox using capsicum */ +#undef SANDBOX_CAPSICUM + +/* Sandbox using Darwin sandbox_init(3) */ +#undef SANDBOX_DARWIN + +/* no privsep sandboxing */ +#undef SANDBOX_NULL + +/* Sandbox using setrlimit(2) */ +#undef SANDBOX_RLIMIT + +/* Sandbox using seccomp filter */ +#undef SANDBOX_SECCOMP_FILTER + +/* setrlimit RLIMIT_FSIZE works */ +#undef SANDBOX_SKIP_RLIMIT_FSIZE + +/* define if setrlimit RLIMIT_NOFILE breaks things */ +#undef SANDBOX_SKIP_RLIMIT_NOFILE + +/* Sandbox using Solaris/Illumos privileges */ +#undef SANDBOX_SOLARIS + +/* Specify the system call convention in use */ +#undef SECCOMP_AUDIT_ARCH + +/* Define if your platform breaks doing a seteuid before a setuid */ +#undef SETEUID_BREAKS_SETUID + +/* The size of `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of `long int', as computed by sizeof. */ +#undef SIZEOF_LONG_INT + +/* The size of `long long int', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG_INT + +/* The size of `short int', as computed by sizeof. */ +#undef SIZEOF_SHORT_INT + +/* The size of `time_t', as computed by sizeof. */ +#undef SIZEOF_TIME_T + +/* Define as const if snprintf() can declare const char *fmt */ +#undef SNPRINTF_CONST + +/* sockaddr_in has sin_len */ +#undef SOCK_HAS_LEN + +/* Define to a Set Process Title type if your system is supported by + bsd-setproctitle.c */ +#undef SPT_TYPE + +/* Define if sshd somehow reacquires a controlling TTY after setsid() */ +#undef SSHD_ACQUIRES_CTTY + +/* sshd PAM service name */ +#undef SSHD_PAM_SERVICE + +/* Use audit debugging module */ +#undef SSH_AUDIT_EVENTS + +/* Windows is sensitive to read buffer size */ +#undef SSH_IOBUFSZ + +/* non-privileged user for privilege separation */ +#undef SSH_PRIVSEP_USER + +/* Use tunnel device compatibility to OpenBSD */ +#undef SSH_TUN_COMPAT_AF + +/* Open tunnel devices the FreeBSD way */ +#undef SSH_TUN_FREEBSD + +/* Open tunnel devices the Linux tun/tap way */ +#undef SSH_TUN_LINUX + +/* No layer 2 tunnel support */ +#undef SSH_TUN_NO_L2 + +/* Open tunnel devices the OpenBSD way */ +#undef SSH_TUN_OPENBSD + +/* Prepend the address family to IP tunnel traffic */ +#undef SSH_TUN_PREPEND_AF + +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#undef STDC_HEADERS + +/* Define if you want a different $PATH for the superuser */ +#undef SUPERUSER_PATH + +/* syslog_r function is safe to use in in a signal handler */ +#undef SYSLOG_R_SAFE_IN_SIGHAND + +/* Have sshd notify systemd on start/reload */ +#undef SYSTEMD_NOTIFY + +/* Support routing domains using Linux VRF */ +#undef SYS_RDOMAIN_LINUX + +/* Support passwords > 8 chars */ +#undef UNIXWARE_LONG_PASSWORDS + +/* Specify default $PATH */ +#undef USER_PATH + +/* Define this if you want to use libkafs' AFS support */ +#undef USE_AFS + +/* Enable brainpool */ +#undef USE_BRAINPOOLP256R1 + +/* Use BSM audit module */ +#undef USE_BSM_AUDIT + +/* Use btmp to log bad logins */ +#undef USE_BTMP + +/* Use libedit for sftp */ +#undef USE_LIBEDIT + +/* Use Linux audit module */ +#undef USE_LINUX_AUDIT + +/* Enable OpenSSL engine support */ +#undef USE_OPENSSL_ENGINE + +/* Define if you want to enable PAM support */ +#undef USE_PAM + +/* Use PIPES instead of a socketpair() */ +#undef USE_PIPES + +/* Define if you have Solaris privileges */ +#undef USE_SOLARIS_PRIVS + +/* Define if you have Solaris process contracts */ +#undef USE_SOLARIS_PROCESS_CONTRACTS + +/* Define if you have Solaris projects */ +#undef USE_SOLARIS_PROJECTS + +/* Use libwtmpdb for sshd */ +#undef USE_WTMPDB + +/* compiler variable declarations after code */ +#undef VARIABLE_DECLARATION_AFTER_CODE + +/* compiler supports variable length arrays */ +#undef VARIABLE_LENGTH_ARRAYS + +/* Define if you shouldn't strip 'tty' from your ttyname in [uw]tmp */ +#undef WITH_ABBREV_NO_TTY + +/* Define if you want to enable AIX4's authenticate function */ +#undef WITH_AIXAUTHENTICATE + +/* Define if you have/want arrays (cluster-wide session management, not C + arrays) */ +#undef WITH_IRIX_ARRAY + +/* Define if you want IRIX audit trails */ +#undef WITH_IRIX_AUDIT + +/* Define if you want IRIX kernel jobs */ +#undef WITH_IRIX_JOBS + +/* Define if you want IRIX project management */ +#undef WITH_IRIX_PROJECT + +/* use libcrypto for cryptography */ +#undef WITH_OPENSSL + +/* Define if you want SELinux support. */ +#undef WITH_SELINUX + +/* Enable zlib */ +#undef WITH_ZLIB + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif + +/* Define if xauth is found in your path */ +#undef XAUTH_PATH + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + +/* log for bad login attempts */ +#undef _PATH_BTMP + +/* Full path of your "passwd" program */ +#undef _PATH_PASSWD_PROG + +/* Specify location of ssh.pid */ +#undef _PATH_SSH_PIDDIR + +/* Define if we don't have struct __res_state in resolv.h */ +#undef __res_state + +/* Define to rpl_calloc if the replacement function should be used. */ +#undef calloc + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc + +/* Define to rpl_realloc if the replacement function should be used. */ +#undef realloc + +/* type to use in place of socklen_t if not defined */ +#undef socklen_t diff --git a/configure b/configure new file mode 100755 index 000000000000..504d8fc2a611 --- /dev/null +++ b/configure @@ -0,0 +1,28327 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.71 for OpenSSH Portable. +# +# Report bugs to . +# +# +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else $as_nop + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. +as_nl=' +' +export as_nl +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + +# The user is always right. +if ${PATH_SEPARATOR+false} :; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else \$as_nop + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : + +else \$as_nop + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null +then : + as_have_required=yes +else $as_nop + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : + +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$as_shell as_have_required=yes + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : + break 2 +fi +fi + done;; + esac + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi + + + if test "x$CONFIG_SHELL" != x +then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." + else + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and +$0: openssh-unix-dev@mindrot.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else $as_nop + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else $as_nop + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + printf "%s\n" "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='OpenSSH' +PACKAGE_TARNAME='openssh' +PACKAGE_VERSION='Portable' +PACKAGE_STRING='OpenSSH Portable' +PACKAGE_BUGREPORT='openssh-unix-dev@mindrot.org' +PACKAGE_URL='' + +ac_unique_file="ssh.c" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_STDIO_H +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_header_c_list= +ac_subst_vars='LTLIBOBJS +COMPATINCLUDES +CFLAGS_NOPIE +LDFLAGS_NOPIE +TMUX +DROPBEARCONVERT +DROPBEARKEY +DBCLIENT +DROPBEAR +CONCH +PUTTYGEN +PLINK +DEPEND +UNSUPPORTED_ALGORITHMS +TEST_MALLOC_OPTIONS +TEST_SSH_UTF8 +TEST_SSH_IPV6 +piddir +user_path +mansubdir +MANTYPE +XAUTH_PATH +STRIP_OPT +xauth_path +PRIVSEP_PATH +CHANNELLIBS +K5LIBS +GSSLIBS +KRB5CONF +SSHDLIBS +SSH_PRIVSEP_USER +SK_STANDALONE +LIBFIDO2 +SK_DUMMY_LIBRARY +OPENSSL_BIN +openssl_bin +PICFLAG +LIBWTMPDB +LIBEDIT +LDNSCONFIG +LIBOBJS +TESTLIBS +LD +PATH_PASSWD_PROG +STARTUP_SCRIPT_SHELL +MAKE_PACKAGE_SUPPORTED +PATH_USERADD_PROG +PATH_GROUPADD_PROG +MANFMT +TEST_SHELL +PKGCONFIG +MANDOC +NROFF +GROFF +SH +TEST_MINUS_S_SH +SED +KILL +CAT +ac_ct_AR +AR +MKDIR_P +EGREP +GREP +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +RANLIB +CPP +AWK +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +runstatedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_largefile +with_openssl +with_stackprotect +with_hardening +with_retpoline +with_rpath +with_cflags +with_cflags_after +with_cppflags +with_ldflags +with_ldflags_after +with_libs +with_Werror +with_linux_memlock_onfault +with_solaris_contracts +with_solaris_projects +with_solaris_privs +with_osfsia +with_zlib +with_zlib_version_check +with_ldns +with_libedit +with_wtmpdb +with_audit +with_pie +enable_pkcs11 +enable_security_key +with_security_key_builtin +with_security_key_standalone +with_ssl_dir +with_openssl_header_check +with_ssl_engine +with_prngd_port +with_prngd_socket +with_pam +with_pam_service +with_privsep_user +with_sandbox +with_selinux +with_kerberos5 +with_privsep_path +with_xauth +enable_strip +with_maildir +with_mantype +with_shadow +with_ipaddr_display +enable_etc_default_login +with_default_path +with_superuser_path +with_4in6 +with_bsd_auth +with_pid_dir +enable_fd_passing +enable_lastlog +enable_utmp +enable_utmpx +enable_wtmp +enable_wtmpx +enable_libutil +enable_pututline +enable_pututxline +with_lastlog +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir runstatedir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures OpenSSH Portable to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/openssh] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of OpenSSH Portable:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-largefile omit support for large files + --disable-pkcs11 disable PKCS#11 support code [no] + --disable-security-key disable U2F/FIDO support code no + --disable-strip Disable calling strip(1) on install + --disable-etc-default-login Disable using PATH from /etc/default/login no + --disable-fd-passing disable file descriptor passsing no + --disable-lastlog disable use of lastlog even if detected no + --disable-utmp disable use of utmp even if detected no + --disable-utmpx disable use of utmpx even if detected no + --disable-wtmp disable use of wtmp even if detected no + --disable-wtmpx disable use of wtmpx even if detected no + --disable-libutil disable use of libutil (login() etc.) no + --disable-pututline disable use of pututline() etc. (uwtmp) no + --disable-pututxline disable use of pututxline() etc. (uwtmpx) no + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** + --without-stackprotect Don't use compiler's stack protection + --without-hardening Don't use toolchain hardening flags + --without-retpoline Enable retpoline spectre mitigation + --without-rpath Disable auto-added -R linker paths + --with-cflags Specify additional flags to pass to compiler + --with-cflags-after Specify additional flags to pass to compiler after configure + --with-cppflags Specify additional flags to pass to preprocessor + --with-ldflags Specify additional flags to pass to linker + --with-ldflags-after Specify additional flags to pass to linker after configure + --with-libs Specify additional libraries to link with + --with-Werror Build main code with -Werror + --with-linux-memlock-onfault Enables memory locking on Linux + --with-solaris-contracts Enable Solaris process contracts (experimental) + --with-solaris-projects Enable Solaris projects (experimental) + --with-solaris-privs Enable Solaris/Illumos privileges (experimental) + --with-osfsia Enable Digital Unix SIA + --with-zlib=PATH Use zlib in PATH + --without-zlib-version-check Disable zlib version check + --with-ldns[=PATH] Use ldns for DNSSEC support (optionally in PATH) + --with-libedit[=PATH] Enable libedit support for sftp + --with-wtmpdb[=PATH] Enable wtmpdb support for sshd + --with-audit=module Enable audit support (modules=debug,bsm,linux) + --with-pie Build Position Independent Executables if possible + --with-security-key-builtin include builtin U2F/FIDO support + --with-security-key-standalone build standalone sk-libfido2 SecurityKeyProvider + --with-ssl-dir=PATH Specify path to OpenSSL installation + --without-openssl-header-check Disable OpenSSL version consistency check + --with-ssl-engine Enable OpenSSL (hardware) ENGINE support + --with-prngd-port=PORT read entropy from PRNGD/EGD TCP localhost:PORT + --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool) + --with-pam Enable PAM support + --with-pam-service=name Specify PAM service name + --with-privsep-user=user Specify non-privileged user for privilege separation + --with-sandbox=style Specify privilege separation sandbox (no, capsicum, darwin, rlimit, seccomp_filter) + --with-selinux Enable SELinux support + --with-kerberos5=PATH Enable Kerberos 5 support + --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty) + --with-xauth=PATH Specify path to xauth program + --with-maildir=/path/to/mail Specify your system mail directory + --with-mantype=man|cat|doc Set man page type + --without-shadow Disable shadow password support + --with-ipaddr-display Use ip address instead of hostname in $DISPLAY + --with-default-path= Specify default $PATH environment for server + --with-superuser-path= Specify different path for super-user + --with-4in6 Check for and convert IPv4 in IPv6 mapped addresses + --with-bsd-auth Enable BSD auth support + --with-pid-dir=PATH Specify location of sshd.pid file + --with-lastlog=FILE|DIR specify lastlog location common locations + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +OpenSSH configure Portable +generated by GNU Autoconf 2.71 + +Copyright (C) 2021 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest.beam + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else $as_nop + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR +# ------------------------------------------------------------------ +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. +ac_fn_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +printf %s "checking whether $as_decl_name is declared... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + eval ac_save_FLAGS=\$$6 + as_fn_append $6 " $5" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else $as_nop + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + eval $6=\$ac_save_FLAGS + +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_check_decl + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. */ + +#include +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main (void) +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$3=yes" +else $as_nop + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +printf %s "checking for $2.$3... " >&6; } +if eval test \${$4+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main (void) +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$4=yes" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main (void) +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$4=yes" +else $as_nop + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +eval ac_res=\$$4 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_member + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else $as_nop + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_type + +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_hi=$ac_mid; break +else $as_nop + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_lo=$ac_mid; break +else $as_nop + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done +else $as_nop + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_hi=$ac_mid +else $as_nop + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval (void) { return $2; } +static unsigned long int ulongval (void) { return $2; } +#include +#include +int +main (void) +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + echo >>conftest.val; read $3 config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by OpenSSH $as_me Portable, which was +generated by GNU Autoconf 2.71. Invocation command line was + + $ $0$ac_configure_args_raw + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" + # Save into config.log some information that might help in debugging. + { + echo + + printf "%s\n" "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + printf "%s\n" "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + printf "%s\n" "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + printf "%s\n" "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + printf "%s\n" "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + printf "%s\n" "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +printf "%s\n" "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +if test -n "$CONFIG_SITE"; then + ac_site_files="$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" +else + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +fi + +for ac_site_file in $ac_site_files +do + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" + +# Auxiliary files required by this configure script. +ac_aux_files="install-sh config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + +# Check for stale configure as early as possible. +for i in $srcdir/configure.ac $srcdir/m4/*.m4; do + if test "$i" -nt "$srcdir/configure"; then + as_fn_error $? "$i newer than configure, run autoreconf" "$LINENO" 5 + fi +done + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +ac_config_headers="$ac_config_headers config.h" + + + + + + + + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in cc gcc clang + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cc gcc clang +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion -version; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else $as_nop + ac_file='' +fi +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_compiler_gnu=yes +else $as_nop + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+y} +ac_save_CFLAGS=$CFLAGS +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +else $as_nop + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# XXX relax this after reimplementing logit() etc. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports C99-style variadic macros" >&5 +printf %s "checking if $CC supports C99-style variadic macros... " >&6; } + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int f(int a, int b, int c) { return a + b + c; } +#define F(a, ...) f(a, __VA_ARGS__) + +int +main (void) +{ +return F(1, 2, -3); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + as_fn_error $? "*** OpenSSH requires support for C99-style variadic macros" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + + + + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +printf %s "checking whether byte ordering is bigendian... " >&6; } +if test ${ac_cv_c_bigendian+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + +int +main (void) +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + +int +main (void) +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_c_bigendian=yes +else $as_nop + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main (void) +{ +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main (void) +{ +#ifndef _BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_c_bigendian=yes +else $as_nop + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes +then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +unsigned short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + unsigned short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + unsigned short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + unsigned short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + +int +main (void) +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main (void) +{ + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + ac_cv_c_bigendian=no +else $as_nop + ac_cv_c_bigendian=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +printf "%s\n" "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h +;; #( + no) + ;; #( + universal) + +printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + + +# Checks for programs. +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$AWK" && break +done + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test ${ac_cv_prog_CPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + + + # Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test ${ac_cv_path_install+y}; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + 'BusyBox '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test ${ac_cv_path_mkdir+y}; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +# Extract the first word of "cat", so it can be a program name with args. +set dummy cat; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_CAT+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $CAT in + [\\/]* | ?:[\\/]*) + ac_cv_path_CAT="$CAT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_CAT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +CAT=$ac_cv_path_CAT +if test -n "$CAT"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CAT" >&5 +printf "%s\n" "$CAT" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "kill", so it can be a program name with args. +set dummy kill; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_KILL+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $KILL in + [\\/]* | ?:[\\/]*) + ac_cv_path_KILL="$KILL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_KILL="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +KILL=$ac_cv_path_KILL +if test -n "$KILL"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $KILL" >&5 +printf "%s\n" "$KILL" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "sed", so it can be a program name with args. +set dummy sed; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $SED in + [\\/]* | ?:[\\/]*) + ac_cv_path_SED="$SED" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_SED="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +SED=$ac_cv_path_SED +if test -n "$SED"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 +printf "%s\n" "$SED" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "bash", so it can be a program name with args. +set dummy bash; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_TEST_MINUS_S_SH+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $TEST_MINUS_S_SH in + [\\/]* | ?:[\\/]*) + ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_TEST_MINUS_S_SH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH +if test -n "$TEST_MINUS_S_SH"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TEST_MINUS_S_SH" >&5 +printf "%s\n" "$TEST_MINUS_S_SH" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "ksh", so it can be a program name with args. +set dummy ksh; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_TEST_MINUS_S_SH+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $TEST_MINUS_S_SH in + [\\/]* | ?:[\\/]*) + ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_TEST_MINUS_S_SH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH +if test -n "$TEST_MINUS_S_SH"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TEST_MINUS_S_SH" >&5 +printf "%s\n" "$TEST_MINUS_S_SH" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "sh", so it can be a program name with args. +set dummy sh; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_TEST_MINUS_S_SH+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $TEST_MINUS_S_SH in + [\\/]* | ?:[\\/]*) + ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_TEST_MINUS_S_SH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH +if test -n "$TEST_MINUS_S_SH"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TEST_MINUS_S_SH" >&5 +printf "%s\n" "$TEST_MINUS_S_SH" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "bash", so it can be a program name with args. +set dummy bash; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_SH+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $SH in + [\\/]* | ?:[\\/]*) + ac_cv_path_SH="$SH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_SH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +SH=$ac_cv_path_SH +if test -n "$SH"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SH" >&5 +printf "%s\n" "$SH" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "ksh", so it can be a program name with args. +set dummy ksh; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_SH+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $SH in + [\\/]* | ?:[\\/]*) + ac_cv_path_SH="$SH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_SH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +SH=$ac_cv_path_SH +if test -n "$SH"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SH" >&5 +printf "%s\n" "$SH" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "sh", so it can be a program name with args. +set dummy sh; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_SH+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $SH in + [\\/]* | ?:[\\/]*) + ac_cv_path_SH="$SH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_SH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +SH=$ac_cv_path_SH +if test -n "$SH"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SH" >&5 +printf "%s\n" "$SH" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "groff", so it can be a program name with args. +set dummy groff; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GROFF+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $GROFF in + [\\/]* | ?:[\\/]*) + ac_cv_path_GROFF="$GROFF" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GROFF="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GROFF=$ac_cv_path_GROFF +if test -n "$GROFF"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GROFF" >&5 +printf "%s\n" "$GROFF" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +for ac_prog in nroff awf +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_NROFF+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $NROFF in + [\\/]* | ?:[\\/]*) + ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_NROFF="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +NROFF=$ac_cv_path_NROFF +if test -n "$NROFF"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NROFF" >&5 +printf "%s\n" "$NROFF" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$NROFF" && break +done + +# Extract the first word of "mandoc", so it can be a program name with args. +set dummy mandoc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MANDOC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $MANDOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_MANDOC="$MANDOC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_MANDOC="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +MANDOC=$ac_cv_path_MANDOC +if test -n "$MANDOC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANDOC" >&5 +printf "%s\n" "$MANDOC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKGCONFIG=$ac_cv_path_PKGCONFIG +if test -n "$PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +printf "%s\n" "$PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKGCONFIG"; then + ac_pt_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ac_pt_PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG +if test -n "$ac_pt_PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 +printf "%s\n" "$ac_pt_PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_pt_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_path_PKGCONFIG" +fi + +TEST_SHELL=sh + + +if test "x$MANDOC" != "x" ; then + MANFMT="$MANDOC" +elif test "x$NROFF" != "x" ; then + MANFMT="$NROFF -mandoc" +elif test "x$GROFF" != "x" ; then + MANFMT="$GROFF -mandoc -Tascii" +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no manpage formatter found" >&5 +printf "%s\n" "$as_me: WARNING: no manpage formatter found" >&2;} + MANFMT="false" +fi + + +# Extract the first word of "groupadd", so it can be a program name with args. +set dummy groupadd; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PATH_GROUPADD_PROG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PATH_GROUPADD_PROG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PATH_GROUPADD_PROG="$PATH_GROUPADD_PROG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /usr/sbin${PATH_SEPARATOR}/etc +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_GROUPADD_PROG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PATH_GROUPADD_PROG" && ac_cv_path_PATH_GROUPADD_PROG="groupadd" + ;; +esac +fi +PATH_GROUPADD_PROG=$ac_cv_path_PATH_GROUPADD_PROG +if test -n "$PATH_GROUPADD_PROG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_GROUPADD_PROG" >&5 +printf "%s\n" "$PATH_GROUPADD_PROG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "useradd", so it can be a program name with args. +set dummy useradd; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PATH_USERADD_PROG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PATH_USERADD_PROG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PATH_USERADD_PROG="$PATH_USERADD_PROG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /usr/sbin${PATH_SEPARATOR}/etc +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_USERADD_PROG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PATH_USERADD_PROG" && ac_cv_path_PATH_USERADD_PROG="useradd" + ;; +esac +fi +PATH_USERADD_PROG=$ac_cv_path_PATH_USERADD_PROG +if test -n "$PATH_USERADD_PROG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_USERADD_PROG" >&5 +printf "%s\n" "$PATH_USERADD_PROG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "pkgmk", so it can be a program name with args. +set dummy pkgmk; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MAKE_PACKAGE_SUPPORTED+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$MAKE_PACKAGE_SUPPORTED"; then + ac_cv_prog_MAKE_PACKAGE_SUPPORTED="$MAKE_PACKAGE_SUPPORTED" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_MAKE_PACKAGE_SUPPORTED="yes" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_MAKE_PACKAGE_SUPPORTED" && ac_cv_prog_MAKE_PACKAGE_SUPPORTED="no" +fi +fi +MAKE_PACKAGE_SUPPORTED=$ac_cv_prog_MAKE_PACKAGE_SUPPORTED +if test -n "$MAKE_PACKAGE_SUPPORTED"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAKE_PACKAGE_SUPPORTED" >&5 +printf "%s\n" "$MAKE_PACKAGE_SUPPORTED" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -x /sbin/sh; then + STARTUP_SCRIPT_SHELL=/sbin/sh + +else + STARTUP_SCRIPT_SHELL=/bin/sh + +fi + +# System features +# Check whether --enable-largefile was given. +if test ${enable_largefile+y} +then : + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO" +then : + break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} +then : + printf %s "(cached) " >&6 +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h +;; +esac +rm -rf conftest* + fi +fi + + +if test -z "$AR" ; then + as_fn_error $? "*** 'ar' missing, please install or fix your \$PATH ***" "$LINENO" 5 +fi + +# Extract the first word of "passwd", so it can be a program name with args. +set dummy passwd; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PATH_PASSWD_PROG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PATH_PASSWD_PROG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PATH_PASSWD_PROG="$PATH_PASSWD_PROG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_PASSWD_PROG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PATH_PASSWD_PROG=$ac_cv_path_PATH_PASSWD_PROG +if test -n "$PATH_PASSWD_PROG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_PASSWD_PROG" >&5 +printf "%s\n" "$PATH_PASSWD_PROG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test ! -z "$PATH_PASSWD_PROG" ; then + +printf "%s\n" "#define _PATH_PASSWD_PROG \"$PATH_PASSWD_PROG\"" >>confdefs.h + +fi + +LD="$CC" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +printf %s "checking for inline... " >&6; } +if test ${ac_cv_c_inline+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo (void) {return 0; } +$ac_kw foo_t foo (void) {return 0; } +#endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_c_inline=$ac_kw +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +printf "%s\n" "$ac_cv_c_inline" >&6; } + +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; +esac + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +if test ${ac_cv_c_undeclared_builtin_options+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_CFLAGS=$CFLAGS + ac_cv_c_undeclared_builtin_options='cannot detect' + for ac_arg in '' -fno-builtin; do + CFLAGS="$ac_save_CFLAGS $ac_arg" + # This test program should *not* compile successfully. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +(void) strchr; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else $as_nop + # This test program should compile successfully. + # No library function is consistently available on + # freestanding implementations, so test against a dummy + # declaration. Include always-available headers on the + # off chance that they somehow elicit warnings. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +extern void ac_decl (int, char *); + +int +main (void) +{ +(void) ac_decl (0, (char *) 0); + (void) ac_decl; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_arg" = x +then : + ac_cv_c_undeclared_builtin_options='none needed' +else $as_nop + ac_cv_c_undeclared_builtin_options=$ac_arg +fi + break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + CFLAGS=$ac_save_CFLAGS + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 +printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } + case $ac_cv_c_undeclared_builtin_options in #( + 'cannot detect') : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot make $CC report undeclared builtins +See \`config.log' for more details" "$LINENO" 5; } ;; #( + 'none needed') : + ac_c_undeclared_builtin_options='' ;; #( + *) : + ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; +esac + +ac_fn_check_decl "$LINENO" "LLONG_MAX" "ac_cv_have_decl_LLONG_MAX" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_LLONG_MAX" = xyes +then : + have_llong_max=1 +fi +ac_fn_check_decl "$LINENO" "LONG_LONG_MAX" "ac_cv_have_decl_LONG_LONG_MAX" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_LONG_LONG_MAX" = xyes +then : + have_long_long_max=1 +fi +ac_fn_check_decl "$LINENO" "RLIMIT_NPROC" "ac_cv_have_decl_RLIMIT_NPROC" " + #include + #include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_RLIMIT_NPROC" = xyes +then : + +printf "%s\n" "#define HAVE_RLIMIT_NPROC /**/" >>confdefs.h + +fi +ac_fn_check_decl "$LINENO" "PR_SET_NO_NEW_PRIVS" "ac_cv_have_decl_PR_SET_NO_NEW_PRIVS" " + #include + #include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_PR_SET_NO_NEW_PRIVS" = xyes +then : + have_linux_no_new_privs=1 +fi + +openssl=yes +openssl_bin=openssl + +# Check whether --with-openssl was given. +if test ${with_openssl+y} +then : + withval=$with_openssl; if test "x$withval" = "xno" ; then + openssl=no + openssl_bin="" + fi + + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL will be used for cryptography" >&5 +printf %s "checking whether OpenSSL will be used for cryptography... " >&6; } +if test "x$openssl" = "xyes" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define WITH_OPENSSL 1" >>confdefs.h + +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + +use_stack_protector=1 +use_toolchain_hardening=1 +use_retpoline=1 + +# Check whether --with-stackprotect was given. +if test ${with_stackprotect+y} +then : + withval=$with_stackprotect; + if test "x$withval" = "xno"; then + use_stack_protector=0 + fi +fi + + +# Check whether --with-hardening was given. +if test ${with_hardening+y} +then : + withval=$with_hardening; + if test "x$withval" = "xno"; then + use_toolchain_hardening=0 + fi +fi + + +# Check whether --with-retpoline was given. +if test ${with_retpoline+y} +then : + withval=$with_retpoline; + if test "x$withval" = "xno"; then + use_retpoline=0 + fi +fi + + +# We use -Werror for the tests only so that we catch warnings like "this is +# on by default" for things like -fPIE. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 +printf %s "checking if $CC supports -Werror... " >&6; } +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Werror" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(void) { return 0; } +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + WERROR="-Werror" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + WERROR="" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CFLAGS="$saved_CFLAGS" + +if test "$GCC" = "yes" || test "$GCC" = "egcs"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5 +printf %s "checking gcc version... " >&6; } + GCC_VER=`$CC -v 2>&1 | $AWK '/gcc version /{print $3}'` + case "$GCC_VER" in + 1.*) no_attrib_nonnull=1 ;; + 2.8* | 2.9*) + no_attrib_nonnull=1 + ;; + 2.*) no_attrib_nonnull=1 ;; + *) ;; + esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GCC_VER" >&5 +printf "%s\n" "$GCC_VER" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking clang version" >&5 +printf %s "checking clang version... " >&6; } + ver="`$CC -v 2>&1`" + if echo "$ver" | grep "Apple" >/dev/null; then + CLANG_VER=apple-`echo "$ver" | grep 'clang version' | \ + $SED 's/.*clang version //g' | $AWK '{print $1}'` + else + CLANG_VER=`echo "$ver" | grep 'clang version' | \ + $SED 's/.*clang version //g' | $AWK '{print $1}'` + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CLANG_VER" >&5 +printf "%s\n" "$CLANG_VER" >&6; } + + { + ossh_cache_var=ossh_cv_cflag__pipe + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -pipe" >&5 +printf %s "checking if $CC supports compile flag -pipe... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -pipe" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-pipe" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wunknown_warning_option + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wunknown-warning-option" >&5 +printf %s "checking if $CC supports compile flag -Wunknown-warning-option... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wunknown-warning-option" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wunknown-warning-option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wno_error_format_truncation + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wno-error=format-truncation" >&5 +printf %s "checking if $CC supports compile flag -Wno-error=format-truncation... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wno-error=format-truncation" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wno-error=format-truncation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Qunused_arguments + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Qunused-arguments" >&5 +printf %s "checking if $CC supports compile flag -Qunused-arguments... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Qunused-arguments" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Qunused-arguments" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wall + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wall" >&5 +printf %s "checking if $CC supports compile flag -Wall... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wall" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wall" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wextra + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wextra" >&5 +printf %s "checking if $CC supports compile flag -Wextra... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wextra" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wextra" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wpointer_arith + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wpointer-arith" >&5 +printf %s "checking if $CC supports compile flag -Wpointer-arith... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wpointer-arith" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wpointer-arith" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wuninitialized + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wuninitialized" >&5 +printf %s "checking if $CC supports compile flag -Wuninitialized... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wuninitialized" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wuninitialized" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wsign_compare + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wsign-compare" >&5 +printf %s "checking if $CC supports compile flag -Wsign-compare... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wsign-compare" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wsign-compare" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wformat_security + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wformat-security" >&5 +printf %s "checking if $CC supports compile flag -Wformat-security... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wformat-security" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wformat-security" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wsizeof_pointer_memaccess + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wsizeof-pointer-memaccess" >&5 +printf %s "checking if $CC supports compile flag -Wsizeof-pointer-memaccess... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wsizeof-pointer-memaccess" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wsizeof-pointer-memaccess" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wpointer_sign + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wpointer-sign" >&5 +printf %s "checking if $CC supports compile flag -Wpointer-sign... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wpointer-sign" + _define_flag="-Wno-pointer-sign" + test "x$_define_flag" = "x" && _define_flag="-Wpointer-sign" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wunused_parameter + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wunused-parameter" >&5 +printf %s "checking if $CC supports compile flag -Wunused-parameter... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wunused-parameter" + _define_flag="-Wno-unused-parameter" + test "x$_define_flag" = "x" && _define_flag="-Wunused-parameter" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wunused_result + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wunused-result" >&5 +printf %s "checking if $CC supports compile flag -Wunused-result... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wunused-result" + _define_flag="-Wno-unused-result" + test "x$_define_flag" = "x" && _define_flag="-Wunused-result" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wimplicit_fallthrough + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wimplicit-fallthrough" >&5 +printf %s "checking if $CC supports compile flag -Wimplicit-fallthrough... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wimplicit-fallthrough" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wimplicit-fallthrough" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wmisleading_indentation + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wmisleading-indentation" >&5 +printf %s "checking if $CC supports compile flag -Wmisleading-indentation... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wmisleading-indentation" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wmisleading-indentation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__Wbitwise_instead_of_logical + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wbitwise-instead-of-logical" >&5 +printf %s "checking if $CC supports compile flag -Wbitwise-instead-of-logical... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wbitwise-instead-of-logical" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wbitwise-instead-of-logical" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_cflag__fno_strict_aliasing + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -fno-strict-aliasing" >&5 +printf %s "checking if $CC supports compile flag -fno-strict-aliasing... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -fno-strict-aliasing" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-fno-strict-aliasing" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + if test "x$use_toolchain_hardening" = "x1"; then + { + ossh_cache_var=ossh_cv_cflag__D_FORTIFY_SOURCE_2 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -D_FORTIFY_SOURCE=2" >&5 +printf %s "checking if $CC supports compile flag -D_FORTIFY_SOURCE=2... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -D_FORTIFY_SOURCE=2" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-D_FORTIFY_SOURCE=2" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_ldflag__Wl__z_relro + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -Wl,-z,relro" >&5 +printf %s "checking if $LD supports link flag -Wl,-z,relro... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $WERROR -Wl,-z,relro" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wl,-z,relro" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + LDFLAGS="$saved_LDFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_ldflag__Wl__z_now + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -Wl,-z,now" >&5 +printf %s "checking if $LD supports link flag -Wl,-z,now... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $WERROR -Wl,-z,now" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wl,-z,now" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + LDFLAGS="$saved_LDFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_ldflag__Wl__z_noexecstack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -Wl,-z,noexecstack" >&5 +printf %s "checking if $LD supports link flag -Wl,-z,noexecstack... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $WERROR -Wl,-z,noexecstack" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wl,-z,noexecstack" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + LDFLAGS="$saved_LDFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + # NB. -ftrapv expects certain support functions to be present in + # the compiler library (libgcc or similar) to detect integer operations + # that can overflow. We must check that the result of enabling it + # actually links. The test program compiled/linked includes a number + # of integer operations that should exercise this. + { + ossh_cache_var=ossh_cv_cflag__ftrapv + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -ftrapv and linking succeeds" >&5 +printf %s "checking if $CC supports compile flag -ftrapv and linking succeeds... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -ftrapv" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-ftrapv" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + # clang 15 seems to have a bug in -fzero-call-used-regs=all. See + # https://bugzilla.mindrot.org/show_bug.cgi?id=3475 and + # https://github.com/llvm/llvm-project/issues/59242 + # clang 17 has a different bug that causes an ICE when using this + # flag at all (https://bugzilla.mindrot.org/show_bug.cgi?id=3629) + case "$CLANG_VER" in + apple-15*) { + ossh_cache_var=ossh_cv_cflag__fzero_call_used_regs_used + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -fzero-call-used-regs=used and linking succeeds" >&5 +printf %s "checking if $CC supports compile flag -fzero-call-used-regs=used and linking succeeds... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -fzero-call-used-regs=used" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-fzero-call-used-regs=used" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} ;; + 17*) ;; + *) { + ossh_cache_var=ossh_cv_cflag__fzero_call_used_regs_used + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -fzero-call-used-regs=used and linking succeeds" >&5 +printf %s "checking if $CC supports compile flag -fzero-call-used-regs=used and linking succeeds... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -fzero-call-used-regs=used" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-fzero-call-used-regs=used" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} ;; + esac + { + ossh_cache_var=ossh_cv_cflag__ftrivial_auto_var_init_zero + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -ftrivial-auto-var-init=zero" >&5 +printf %s "checking if $CC supports compile flag -ftrivial-auto-var-init=zero... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -ftrivial-auto-var-init=zero" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-ftrivial-auto-var-init=zero" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + fi + if test "x$use_retpoline" = "x1"; then + { + ossh_cache_var=ossh_cv_cflag__mretpoline + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -mretpoline" >&5 +printf %s "checking if $CC supports compile flag -mretpoline... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -mretpoline" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-mretpoline" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} # clang + { + ossh_cache_var=ossh_cv_ldflag__Wl__z_retpolineplt + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -Wl,-z,retpolineplt" >&5 +printf %s "checking if $LD supports link flag -Wl,-z,retpolineplt... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $WERROR -Wl,-z,retpolineplt" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wl,-z,retpolineplt" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + LDFLAGS="$saved_LDFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fno-builtin-memset" >&5 +printf %s "checking if $CC accepts -fno-builtin-memset... " >&6; } + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fno-builtin-memset" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + char b[10]; memset(b, 0, sizeof(b)); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + # -fstack-protector-all doesn't always work for some GCC versions + # and/or platforms, so we test if we can. If it's not supported + # on a given platform gcc will emit a warning so we use -Werror. + if test "x$use_stack_protector" = "x1"; then + for t in -fstack-protector-strong -fstack-protector-all \ + -fstack-protector; do + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports $t" >&5 +printf %s "checking if $CC supports $t... " >&6; } + saved_CFLAGS="$CFLAGS" + saved_LDFLAGS="$LDFLAGS" + CFLAGS="$CFLAGS $t -Werror" + LDFLAGS="$LDFLAGS $t -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + int func (int t) {char b[100]; snprintf(b,sizeof b,"%d",t); return t;} + +int +main (void) +{ + + char x[256]; + snprintf(x, sizeof(x), "XXX%d", func(1)); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + CFLAGS="$saved_CFLAGS $t" + LDFLAGS="$saved_LDFLAGS $t" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $t works" >&5 +printf %s "checking if $t works... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: cannot test" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: cannot test" >&2;} + break + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + int func (int t) {char b[100]; snprintf(b,sizeof b,"%d",t); return t;} + +int +main (void) +{ + + char x[256]; + snprintf(x, sizeof(x), "XXX%d", func(1)); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + break +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$saved_CFLAGS" + LDFLAGS="$saved_LDFLAGS" + done + fi + + if test -z "$have_llong_max"; then + # retry LLONG_MAX with -std=gnu99, needed on some Linuxes + unset ac_cv_have_decl_LLONG_MAX + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -std=gnu99" + ac_fn_check_decl "$LINENO" "LLONG_MAX" "ac_cv_have_decl_LLONG_MAX" "#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_LLONG_MAX" = xyes +then : + have_llong_max=1 +else $as_nop + CFLAGS="$saved_CFLAGS" +fi + fi +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler allows __attribute__ on return types" >&5 +printf %s "checking if compiler allows __attribute__ on return types... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +__attribute__((__unused__)) static void foo(void){return;} +int +main (void) +{ + exit(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define NO_ATTRIBUTE_ON_RETURN_TYPE 1" >>confdefs.h + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler allows __attribute__ prototype args" >&5 +printf %s "checking if compiler allows __attribute__ prototype args... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +typedef void foo(const char *, ...) __attribute__((format(printf, 1, 2))); +int +main (void) +{ + exit(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define NO_ATTRIBUTE_ON_PROTOTYPE_ARGS 1" >>confdefs.h + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports variable length arrays" >&5 +printf %s "checking if compiler supports variable length arrays... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ + int i; for (i=0; i<3; i++){int a[i]; a[i-1]=0;} exit(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define VARIABLE_LENGTH_ARRAYS 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts variable declarations after code" >&5 +printf %s "checking if compiler accepts variable declarations after code... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ + int a; a = 1; int b = 1; exit(a-b); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define VARIABLE_DECLARATION_AFTER_CODE 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Werror" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports __nonstring__ attribute on char arrays" >&5 +printf %s "checking if compiler supports __nonstring__ attribute on char arrays... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ + char __attribute__ ((__nonstring__)) h[5] = "hello"; return h[0]!='h'; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAVE_ATTRIBUTE__NONSTRING__ 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CFLAGS="$saved_CFLAGS" + +if test "x$no_attrib_nonnull" != "x1" ; then + +printf "%s\n" "#define HAVE_ATTRIBUTE__NONNULL__ 1" >>confdefs.h + +fi + + +# Check whether --with-rpath was given. +if test ${with_rpath+y} +then : + withval=$with_rpath; + if test "x$withval" = "xno" ; then + rpath_opt="" + elif test "x$withval" = "xyes" ; then + rpath_opt="-R" + else + rpath_opt="$withval" + fi + + +fi + + +# Allow user to specify flags + +# Check whether --with-cflags was given. +if test ${with_cflags+y} +then : + withval=$with_cflags; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CFLAGS="$CFLAGS $withval" + fi + + +fi + + + +# Check whether --with-cflags-after was given. +if test ${with_cflags_after+y} +then : + withval=$with_cflags_after; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CFLAGS_AFTER="$withval" + fi + + +fi + + +# Check whether --with-cppflags was given. +if test ${with_cppflags+y} +then : + withval=$with_cppflags; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CPPFLAGS="$CPPFLAGS $withval" + fi + + +fi + + +# Check whether --with-ldflags was given. +if test ${with_ldflags+y} +then : + withval=$with_ldflags; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LDFLAGS="$LDFLAGS $withval" + fi + + +fi + + +# Check whether --with-ldflags-after was given. +if test ${with_ldflags_after+y} +then : + withval=$with_ldflags_after; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LDFLAGS_AFTER="$withval" + fi + + +fi + + +# Check whether --with-libs was given. +if test ${with_libs+y} +then : + withval=$with_libs; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LIBS="$LIBS $withval" + fi + + +fi + + +# Check whether --with-Werror was given. +if test ${with_Werror+y} +then : + withval=$with_Werror; + if test -n "$withval" && test "x$withval" != "xno"; then + werror_flags="-Werror" + if test "x${withval}" != "xyes"; then + werror_flags="$withval" + fi + fi + + +fi + + +if test "x$ac_cv_header_sys_stat_h" != "xyes"; then + unset ac_cv_header_sys_stat_h + ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_stat_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h + +fi + +fi + +ac_fn_c_check_header_compile "$LINENO" "blf.h" "ac_cv_header_blf_h" "$ac_includes_default" +if test "x$ac_cv_header_blf_h" = xyes +then : + printf "%s\n" "#define HAVE_BLF_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "bstring.h" "ac_cv_header_bstring_h" "$ac_includes_default" +if test "x$ac_cv_header_bstring_h" = xyes +then : + printf "%s\n" "#define HAVE_BSTRING_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default" +if test "x$ac_cv_header_crypt_h" = xyes +then : + printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "crypto/sha2.h" "ac_cv_header_crypto_sha2_h" "$ac_includes_default" +if test "x$ac_cv_header_crypto_sha2_h" = xyes +then : + printf "%s\n" "#define HAVE_CRYPTO_SHA2_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "$ac_includes_default" +if test "x$ac_cv_header_dirent_h" = xyes +then : + printf "%s\n" "#define HAVE_DIRENT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" +if test "x$ac_cv_header_elf_h" = xyes +then : + printf "%s\n" "#define HAVE_ELF_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "err.h" "ac_cv_header_err_h" "$ac_includes_default" +if test "x$ac_cv_header_err_h" = xyes +then : + printf "%s\n" "#define HAVE_ERR_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "features.h" "ac_cv_header_features_h" "$ac_includes_default" +if test "x$ac_cv_header_features_h" = xyes +then : + printf "%s\n" "#define HAVE_FEATURES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = xyes +then : + printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "floatingpoint.h" "ac_cv_header_floatingpoint_h" "$ac_includes_default" +if test "x$ac_cv_header_floatingpoint_h" = xyes +then : + printf "%s\n" "#define HAVE_FLOATINGPOINT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "fnmatch.h" "ac_cv_header_fnmatch_h" "$ac_includes_default" +if test "x$ac_cv_header_fnmatch_h" = xyes +then : + printf "%s\n" "#define HAVE_FNMATCH_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" +if test "x$ac_cv_header_getopt_h" = xyes +then : + printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "ia.h" "ac_cv_header_ia_h" "$ac_includes_default" +if test "x$ac_cv_header_ia_h" = xyes +then : + printf "%s\n" "#define HAVE_IA_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "iaf.h" "ac_cv_header_iaf_h" "$ac_includes_default" +if test "x$ac_cv_header_iaf_h" = xyes +then : + printf "%s\n" "#define HAVE_IAF_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" +if test "x$ac_cv_header_inttypes_h" = xyes +then : + printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_langinfo_h" = xyes +then : + printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default" +if test "x$ac_cv_header_limits_h" = xyes +then : + printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = xyes +then : + printf "%s\n" "#define HAVE_LOCALE_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "login.h" "ac_cv_header_login_h" "$ac_includes_default" +if test "x$ac_cv_header_login_h" = xyes +then : + printf "%s\n" "#define HAVE_LOGIN_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "maillock.h" "ac_cv_header_maillock_h" "$ac_includes_default" +if test "x$ac_cv_header_maillock_h" = xyes +then : + printf "%s\n" "#define HAVE_MAILLOCK_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "ndir.h" "ac_cv_header_ndir_h" "$ac_includes_default" +if test "x$ac_cv_header_ndir_h" = xyes +then : + printf "%s\n" "#define HAVE_NDIR_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "net/if_tun.h" "ac_cv_header_net_if_tun_h" "$ac_includes_default" +if test "x$ac_cv_header_net_if_tun_h" = xyes +then : + printf "%s\n" "#define HAVE_NET_IF_TUN_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default" +if test "x$ac_cv_header_netdb_h" = xyes +then : + printf "%s\n" "#define HAVE_NETDB_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "pam/pam_appl.h" "ac_cv_header_pam_pam_appl_h" "$ac_includes_default" +if test "x$ac_cv_header_pam_pam_appl_h" = xyes +then : + printf "%s\n" "#define HAVE_PAM_PAM_APPL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "pty.h" "ac_cv_header_pty_h" "$ac_includes_default" +if test "x$ac_cv_header_pty_h" = xyes +then : + printf "%s\n" "#define HAVE_PTY_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "readpassphrase.h" "ac_cv_header_readpassphrase_h" "$ac_includes_default" +if test "x$ac_cv_header_readpassphrase_h" = xyes +then : + printf "%s\n" "#define HAVE_READPASSPHRASE_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "rpc/types.h" "ac_cv_header_rpc_types_h" "$ac_includes_default" +if test "x$ac_cv_header_rpc_types_h" = xyes +then : + printf "%s\n" "#define HAVE_RPC_TYPES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default" +if test "x$ac_cv_header_security_pam_appl_h" = xyes +then : + printf "%s\n" "#define HAVE_SECURITY_PAM_APPL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sha2.h" "ac_cv_header_sha2_h" "$ac_includes_default" +if test "x$ac_cv_header_sha2_h" = xyes +then : + printf "%s\n" "#define HAVE_SHA2_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default" +if test "x$ac_cv_header_shadow_h" = xyes +then : + printf "%s\n" "#define HAVE_SHADOW_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default" +if test "x$ac_cv_header_stddef_h" = xyes +then : + printf "%s\n" "#define HAVE_STDDEF_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes +then : + printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" +if test "x$ac_cv_header_strings_h" = xyes +then : + printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_bitypes_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_BITYPES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/byteorder.h" "ac_cv_header_sys_byteorder_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_byteorder_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_BYTEORDER_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/bsdtty.h" "ac_cv_header_sys_bsdtty_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_bsdtty_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_BSDTTY_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/cdefs.h" "ac_cv_header_sys_cdefs_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_cdefs_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_CDEFS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/dir.h" "ac_cv_header_sys_dir_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_dir_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_DIR_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_file_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mman_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/label.h" "ac_cv_header_sys_label_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_label_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_LABEL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/ndir.h" "ac_cv_header_sys_ndir_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ndir_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_NDIR_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_param_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_poll_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/prctl.h" "ac_cv_header_sys_prctl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_prctl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PRCTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/procctl.h" "ac_cv_header_sys_procctl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_procctl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PROCCTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_pstat_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PSTAT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/ptrace.h" "ac_cv_header_sys_ptrace_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ptrace_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PTRACE_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/random.h" "ac_cv_header_sys_random_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_random_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_RANDOM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_select_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/stream.h" "ac_cv_header_sys_stream_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_stream_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_STREAM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/stropts.h" "ac_cv_header_sys_stropts_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_stropts_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_STROPTS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/strtio.h" "ac_cv_header_sys_strtio_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_strtio_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_STRTIO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_statvfs_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sysmacros_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/timers.h" "ac_cv_header_sys_timers_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_timers_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_TIMERS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_vfs_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_VFS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "tmpdir.h" "ac_cv_header_tmpdir_h" "$ac_includes_default" +if test "x$ac_cv_header_tmpdir_h" = xyes +then : + printf "%s\n" "#define HAVE_TMPDIR_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "ttyent.h" "ac_cv_header_ttyent_h" "$ac_includes_default" +if test "x$ac_cv_header_ttyent_h" = xyes +then : + printf "%s\n" "#define HAVE_TTYENT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "ucred.h" "ac_cv_header_ucred_h" "$ac_includes_default" +if test "x$ac_cv_header_ucred_h" = xyes +then : + printf "%s\n" "#define HAVE_UCRED_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = xyes +then : + printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "usersec.h" "ac_cv_header_usersec_h" "$ac_includes_default" +if test "x$ac_cv_header_usersec_h" = xyes +then : + printf "%s\n" "#define HAVE_USERSEC_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "$ac_includes_default" +if test "x$ac_cv_header_utime_h" = xyes +then : + printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "utmp.h" "ac_cv_header_utmp_h" "$ac_includes_default" +if test "x$ac_cv_header_utmp_h" = xyes +then : + printf "%s\n" "#define HAVE_UTMP_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "utmpx.h" "ac_cv_header_utmpx_h" "$ac_includes_default" +if test "x$ac_cv_header_utmpx_h" = xyes +then : + printf "%s\n" "#define HAVE_UTMPX_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "vis.h" "ac_cv_header_vis_h" "$ac_includes_default" +if test "x$ac_cv_header_vis_h" = xyes +then : + printf "%s\n" "#define HAVE_VIS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" +if test "x$ac_cv_header_wchar_h" = xyes +then : + printf "%s\n" "#define HAVE_WCHAR_H 1" >>confdefs.h + +fi + + +# Create replacement header files for common headers that are missing on this +# platform. Usually these are just empty, but in some cases they'll include +# the equivalent file. This avoids having to wrap those includes in +# '#ifdef HAVE_FOO_H'. If we create any such headers, add the path to includes. +COMPATINCLUDESDIR="openbsd-compat/include" +COMPATINCLUDES="" + for ac_header in endian.h ifaddrs.h libgen.h paths.h netgroup.h nlist.h poll.h stdint.h sys/mman.h sys/stat.h sys/statvfs.h sys/time.h sys/un.h time.h util.h +do : + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : + cat >>confdefs.h <<_ACEOF +#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + # Remove any old shims. + rm -f "$COMPATINCLUDESDIR/$ac_header" + +else $as_nop + + COMPATINCLUDES="$COMPATINCLUDESDIR" + header="$COMPATINCLUDES/$ac_header" + dir=`dirname "$header"` + mkdir -p "$dir" + case "$ac_header" in + poll.h) echo '#ifdef HAVE_SYS_POLL_H' + echo '#include ' + echo '#endif' ;; + *) ;; + esac >"$header" + +fi + +done + +for include in sys/queue.h sys/tree.h; do + COMPATINCLUDES="$COMPATINCLUDESDIR" + header="$COMPATINCLUDES/$include" + dir=`dirname "$header"` + mkdir -p "$dir" + case "$include" in + sys/queue.h) + echo '#include "openbsd-compat/sys-queue.h"' + ;; + sys/tree.h) + echo '#include "openbsd-compat/sys-tree.h"' + ;; + esac >"$header" +done + +ac_fn_check_decl "$LINENO" "le32toh" "ac_cv_have_decl_le32toh" " +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_ENDIAN_H +# include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_le32toh" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_LE32TOH $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "le64toh" "ac_cv_have_decl_le64toh" " +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_ENDIAN_H +# include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_le64toh" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_LE64TOH $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "htole64" "ac_cv_have_decl_htole64" " +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_ENDIAN_H +# include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_htole64" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_HTOLE64 $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "htobe32" "ac_cv_have_decl_htobe32" " +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_ENDIAN_H +# include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_htobe32" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_HTOBE32 $ac_have_decl" >>confdefs.h + + +# On some platforms (eg SunOS4) sys/audit.h requires sys/[time|types|label.h] +# to be included first. +ac_fn_c_check_header_compile "$LINENO" "sys/audit.h" "ac_cv_header_sys_audit_h" " +#ifdef HAVE_SYS_TIME_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_LABEL_H +# include +#endif + +" +if test "x$ac_cv_header_sys_audit_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_AUDIT_H 1" >>confdefs.h + +fi + + +# sys/capsicum.h requires sys/types.h +ac_fn_c_check_header_compile "$LINENO" "sys/capsicum.h" "ac_cv_header_sys_capsicum_h" " +#ifdef HAVE_SYS_TYPES_H +# include +#endif + +" +if test "x$ac_cv_header_sys_capsicum_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_CAPSICUM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "capsicum_helpers.h" "ac_cv_header_capsicum_helpers_h" " +#ifdef HAVE_SYS_TYPES_H +# include +#endif + +" +if test "x$ac_cv_header_capsicum_helpers_h" = xyes +then : + printf "%s\n" "#define HAVE_CAPSICUM_HELPERS_H 1" >>confdefs.h + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for caph_cache_tzdata" >&5 +printf %s "checking for caph_cache_tzdata... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ +caph_cache_tzdata(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAVE_CAPH_CACHE_TZDATA 1" >>confdefs.h + + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +# net/route.h requires sys/socket.h and sys/types.h. +# sys/sysctl.h also requires sys/param.h +ac_fn_c_check_header_compile "$LINENO" "net/route.h" "ac_cv_header_net_route_h" " +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#include +#include + +" +if test "x$ac_cv_header_net_route_h" = xyes +then : + printf "%s\n" "#define HAVE_NET_ROUTE_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" " +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#include +#include + +" +if test "x$ac_cv_header_sys_sysctl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SYSCTL_H 1" >>confdefs.h + +fi + + +# lastlog.h requires sys/time.h to be included first on Solaris +ac_fn_c_check_header_compile "$LINENO" "lastlog.h" "ac_cv_header_lastlog_h" " +#ifdef HAVE_SYS_TIME_H +# include +#endif + +" +if test "x$ac_cv_header_lastlog_h" = xyes +then : + printf "%s\n" "#define HAVE_LASTLOG_H 1" >>confdefs.h + +fi + + +# sys/ptms.h requires sys/stream.h to be included first on Solaris +ac_fn_c_check_header_compile "$LINENO" "sys/ptms.h" "ac_cv_header_sys_ptms_h" " +#ifdef HAVE_SYS_STREAM_H +# include +#endif + +" +if test "x$ac_cv_header_sys_ptms_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PTMS_H 1" >>confdefs.h + +fi + + +# login_cap.h requires sys/types.h on NetBSD +ac_fn_c_check_header_compile "$LINENO" "login_cap.h" "ac_cv_header_login_cap_h" " +#include + +" +if test "x$ac_cv_header_login_cap_h" = xyes +then : + printf "%s\n" "#define HAVE_LOGIN_CAP_H 1" >>confdefs.h + +fi + + +# older BSDs need sys/param.h before sys/mount.h +ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" " +#include + +" +if test "x$ac_cv_header_sys_mount_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h + +fi + + +# Android requires sys/socket.h to be included before sys/un.h +ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" " +#include +#include + +" +if test "x$ac_cv_header_sys_un_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_UN_H 1" >>confdefs.h + +fi + + +# Messages for features tested for in target-specific section +SIA_MSG="no" +SPC_MSG="no" +SP_MSG="no" +SPP_MSG="no" + +# Support for Solaris/Illumos privileges (this test is used by both +# the --with-solaris-privs option and --with-sandbox=solaris). +SOLARIS_PRIVS="no" + +# Default shared library extension +SHLIBEXT=".so" + +# See OpenBSD section in $host case below. +need_pledge_inet="" + +# Check for some target-specific stuff +case "$host" in +*-*-aix*) + # Some versions of VAC won't allow macro redefinitions at + # -qlanglevel=ansi, and autoconf 2.60 sometimes insists on using that + # particularly with older versions of vac or xlc. + # It also throws errors about null macro arguments, but these are + # not fatal. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler allows macro redefinitions" >&5 +printf %s "checking if compiler allows macro redefinitions... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#define testmacro foo +#define testmacro bar +int +main (void) +{ + exit(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + CC="`echo $CC | sed 's/-qlanglvl\=ansi//g'`" + CFLAGS="`echo $CFLAGS | sed 's/-qlanglvl\=ansi//g'`" + CPPFLAGS="`echo $CPPFLAGS | sed 's/-qlanglvl\=ansi//g'`" + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to specify blibpath for linker ($LD)" >&5 +printf %s "checking how to specify blibpath for linker ($LD)... " >&6; } + if (test -z "$blibpath"); then + blibpath="/usr/lib:/lib" + fi + saved_LDFLAGS="$LDFLAGS" + if test "$GCC" = "yes"; then + flags="-Wl,-blibpath: -Wl,-rpath, -blibpath:" + else + flags="-blibpath: -Wl,-blibpath: -Wl,-rpath," + fi + for tryflags in $flags ;do + if (test -z "$blibflags"); then + LDFLAGS="$saved_LDFLAGS $tryflags$blibpath" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + blibflags=$tryflags +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + done + if (test -z "$blibflags"); then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + as_fn_error $? "*** must be able to specify blibpath on AIX - check config.log" "$LINENO" 5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $blibflags" >&5 +printf "%s\n" "$blibflags" >&6; } + fi + LDFLAGS="$saved_LDFLAGS" + ac_fn_c_check_func "$LINENO" "authenticate" "ac_cv_func_authenticate" +if test "x$ac_cv_func_authenticate" = xyes +then : + +printf "%s\n" "#define WITH_AIXAUTHENTICATE 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for authenticate in -ls" >&5 +printf %s "checking for authenticate in -ls... " >&6; } +if test ${ac_cv_lib_s_authenticate+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-ls $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char authenticate (); +int +main (void) +{ +return authenticate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_s_authenticate=yes +else $as_nop + ac_cv_lib_s_authenticate=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_s_authenticate" >&5 +printf "%s\n" "$ac_cv_lib_s_authenticate" >&6; } +if test "x$ac_cv_lib_s_authenticate" = xyes +then : + printf "%s\n" "#define WITH_AIXAUTHENTICATE 1" >>confdefs.h + + LIBS="$LIBS -ls" + +fi + + +fi + + ac_fn_check_decl "$LINENO" "authenticate" "ac_cv_have_decl_authenticate" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_authenticate" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_AUTHENTICATE $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "loginrestrictions" "ac_cv_have_decl_loginrestrictions" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_loginrestrictions" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_LOGINRESTRICTIONS $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "loginsuccess" "ac_cv_have_decl_loginsuccess" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_loginsuccess" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_LOGINSUCCESS $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "passwdexpired" "ac_cv_have_decl_passwdexpired" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_passwdexpired" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_PASSWDEXPIRED $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "setauthdb" "ac_cv_have_decl_setauthdb" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_setauthdb" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_SETAUTHDB $ac_have_decl" >>confdefs.h + + ac_fn_check_decl "$LINENO" "loginfailed" "ac_cv_have_decl_loginfailed" "#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_loginfailed" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_LOGINFAILED $ac_have_decl" >>confdefs.h +if test $ac_have_decl = 1 +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if loginfailed takes 4 arguments" >&5 +printf %s "checking if loginfailed takes 4 arguments... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + (void)loginfailed("user","host","tty",0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define AIX_LOGINFAILED_4ARG 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + ac_fn_c_check_func "$LINENO" "getgrset" "ac_cv_func_getgrset" +if test "x$ac_cv_func_getgrset" = xyes +then : + printf "%s\n" "#define HAVE_GETGRSET 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setauthdb" "ac_cv_func_setauthdb" +if test "x$ac_cv_func_setauthdb" = xyes +then : + printf "%s\n" "#define HAVE_SETAUTHDB 1" >>confdefs.h + +fi + + ac_fn_check_decl "$LINENO" "F_CLOSEM" "ac_cv_have_decl_F_CLOSEM" " #include + #include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_F_CLOSEM" = xyes +then : + +printf "%s\n" "#define HAVE_FCNTL_CLOSEM 1" >>confdefs.h + +fi + check_for_aix_broken_getaddrinfo=1 + +printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + +printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + +printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_LASTLOG 1" >>confdefs.h + + +printf "%s\n" "#define LOGIN_NEEDS_UTMPX 1" >>confdefs.h + + +printf "%s\n" "#define SPT_TYPE SPT_REUSEARGV" >>confdefs.h + + +printf "%s\n" "#define PTY_ZEROREAD 1" >>confdefs.h + + +printf "%s\n" "#define PLATFORM_SYS_DIR_UID 2" >>confdefs.h + + +printf "%s\n" "#define BROKEN_STRNDUP 1" >>confdefs.h + + +printf "%s\n" "#define BROKEN_STRNLEN 1" >>confdefs.h + + ;; +*-*-android*) + +printf "%s\n" "#define DISABLE_UTMP 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_WTMP 1" >>confdefs.h + + ;; +*-*-cygwin*) + LIBS="$LIBS /usr/lib/textreadmode.o" + +printf "%s\n" "#define HAVE_CYGWIN 1" >>confdefs.h + + +printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + +printf "%s\n" "#define NO_UID_RESTORATION_TEST 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_SHADOW 1" >>confdefs.h + + +printf "%s\n" "#define NO_X11_UNIX_SOCKETS 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_FD_PASSING 1" >>confdefs.h + + +printf "%s\n" "#define SSH_IOBUFSZ 65535" >>confdefs.h + + +printf "%s\n" "#define FILESYSTEM_NO_BACKSLASH 1" >>confdefs.h + + # Cygwin defines optargs, optargs as declspec(dllimport) for historical + # reasons which cause compile warnings, so we disable those warnings. + { + ossh_cache_var=ossh_cv_cflag__Wno_attributes + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wno-attributes" >&5 +printf %s "checking if $CC supports compile flag -Wno-attributes... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -Wno-attributes" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-Wno-attributes" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + SHLIBEXT=".dll" + ;; +*-*-dgux*) + +printf "%s\n" "#define IP_TOS_IS_BROKEN 1" >>confdefs.h + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + ;; +*-*-darwin*) + use_pie=auto + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we have working getaddrinfo" >&5 +printf %s "checking if we have working getaddrinfo... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: assume it is working" >&5 +printf "%s\n" "assume it is working" >&6; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +int main(void) { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + exit(0); + else + exit(1); +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: working" >&5 +printf "%s\n" "working" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: buggy" >&5 +printf "%s\n" "buggy" >&6; } + +printf "%s\n" "#define BROKEN_GETADDRINFO 1" >>confdefs.h + + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + broken_glob=yes # OS X glob does not do what we expect + +printf "%s\n" "#define BIND_8_COMPAT 1" >>confdefs.h + + +printf "%s\n" "#define SSH_TUN_FREEBSD 1" >>confdefs.h + + +printf "%s\n" "#define SSH_TUN_COMPAT_AF 1" >>confdefs.h + + +printf "%s\n" "#define SSH_TUN_PREPEND_AF 1" >>confdefs.h + + + ac_fn_check_decl "$LINENO" "AU_IPv4" "ac_cv_have_decl_AU_IPv4" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_AU_IPv4" = xyes +then : + +else $as_nop + +printf "%s\n" "#define AU_IPv4 0" >>confdefs.h + + #include + +printf "%s\n" "#define LASTLOG_WRITE_PUTUTXLINE 1" >>confdefs.h + + +fi + +printf "%s\n" "#define SPT_TYPE SPT_REUSEARGV" >>confdefs.h + + ac_fn_c_check_func "$LINENO" "sandbox_init" "ac_cv_func_sandbox_init" +if test "x$ac_cv_func_sandbox_init" = xyes +then : + printf "%s\n" "#define HAVE_SANDBOX_INIT 1" >>confdefs.h + +fi + + ac_fn_c_check_header_compile "$LINENO" "sandbox.h" "ac_cv_header_sandbox_h" "$ac_includes_default" +if test "x$ac_cv_header_sandbox_h" = xyes +then : + printf "%s\n" "#define HAVE_SANDBOX_H 1" >>confdefs.h + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sandbox_apply in -lsandbox" >&5 +printf %s "checking for sandbox_apply in -lsandbox... " >&6; } +if test ${ac_cv_lib_sandbox_sandbox_apply+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsandbox $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char sandbox_apply (); +int +main (void) +{ +return sandbox_apply (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_sandbox_sandbox_apply=yes +else $as_nop + ac_cv_lib_sandbox_sandbox_apply=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sandbox_sandbox_apply" >&5 +printf "%s\n" "$ac_cv_lib_sandbox_sandbox_apply" >&6; } +if test "x$ac_cv_lib_sandbox_sandbox_apply" = xyes +then : + + SSHDLIBS="$SSHDLIBS -lsandbox" + +fi + + # proc_pidinfo()-based closefrom() replacement. + ac_fn_c_check_header_compile "$LINENO" "libproc.h" "ac_cv_header_libproc_h" "$ac_includes_default" +if test "x$ac_cv_header_libproc_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBPROC_H 1" >>confdefs.h + +fi + + ac_fn_c_check_func "$LINENO" "proc_pidinfo" "ac_cv_func_proc_pidinfo" +if test "x$ac_cv_func_proc_pidinfo" = xyes +then : + printf "%s\n" "#define HAVE_PROC_PIDINFO 1" >>confdefs.h + +fi + + # poll(2) is broken for character-special devices (at least). + # cf. Apple bug 3710161 (not public, but searchable) + +printf "%s\n" "#define BROKEN_POLL 1" >>confdefs.h + + SHLIBEXT=".dylib" + ;; +*-*-dragonfly*) + SSHDLIBS="$SSHDLIBS" + TEST_MALLOC_OPTIONS="AFGJPRX" + ;; +*-*-haiku*) + LIBS="$LIBS -lbsd " + CFLAGS="$CFLAGS -D_BSD_SOURCE" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5 +printf %s "checking for socket in -lnetwork... " >&6; } +if test ${ac_cv_lib_network_socket+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnetwork $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char socket (); +int +main (void) +{ +return socket (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_network_socket=yes +else $as_nop + ac_cv_lib_network_socket=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5 +printf "%s\n" "$ac_cv_lib_network_socket" >&6; } +if test "x$ac_cv_lib_network_socket" = xyes +then : + printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h + + LIBS="-lnetwork $LIBS" + +fi + + printf "%s\n" "#define HAVE_U_INT64_T 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_UTMPX 1" >>confdefs.h + + MANTYPE=man + ;; +*-*-hpux*) + # first we define all of the options common to all HP-UX releases + CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" + IPADDR_IN_DISPLAY=yes + printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + printf "%s\n" "#define LOGIN_NEEDS_UTMPX 1" >>confdefs.h + + +printf "%s\n" "#define LOCKED_PASSWD_STRING \"*\"" >>confdefs.h + + printf "%s\n" "#define SPT_TYPE SPT_PSTAT" >>confdefs.h + + +printf "%s\n" "#define PLATFORM_SYS_DIR_UID 2" >>confdefs.h + + maildir="/var/mail" + LIBS="$LIBS -lsec" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for t_error in -lxnet" >&5 +printf %s "checking for t_error in -lxnet... " >&6; } +if test ${ac_cv_lib_xnet_t_error+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxnet $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char t_error (); +int +main (void) +{ +return t_error (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_xnet_t_error=yes +else $as_nop + ac_cv_lib_xnet_t_error=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xnet_t_error" >&5 +printf "%s\n" "$ac_cv_lib_xnet_t_error" >&6; } +if test "x$ac_cv_lib_xnet_t_error" = xyes +then : + printf "%s\n" "#define HAVE_LIBXNET 1" >>confdefs.h + + LIBS="-lxnet $LIBS" + +else $as_nop + as_fn_error $? "*** -lxnet needed on HP-UX - check config.log ***" "$LINENO" 5 +fi + + + # next, we define all of the options specific to major releases + case "$host" in + *-*-hpux10*) + if test -z "$GCC"; then + CFLAGS="$CFLAGS -Ae" + fi + +printf "%s\n" "#define BROKEN_GETLINE 1" >>confdefs.h + + ;; + *-*-hpux11*) + +printf "%s\n" "#define PAM_SUN_CODEBASE 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_UTMP 1" >>confdefs.h + + +printf "%s\n" "#define USE_BTMP 1" >>confdefs.h + + check_for_hpux_broken_getaddrinfo=1 + check_for_conflicting_getspnam=1 + ;; + esac + + # lastly, we define options specific to minor releases + case "$host" in + *-*-hpux10.26) + +printf "%s\n" "#define HAVE_SECUREWARE 1" >>confdefs.h + + disable_ptmx_check=yes + LIBS="$LIBS -lsecpw" + ;; + esac + ;; +*-*-irix5*) + PATH="$PATH:/usr/etc" + +printf "%s\n" "#define BROKEN_INET_NTOA 1" >>confdefs.h + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + +printf "%s\n" "#define WITH_ABBREV_NO_TTY 1" >>confdefs.h + + printf "%s\n" "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h + + ;; +*-*-irix6*) + PATH="$PATH:/usr/etc" + +printf "%s\n" "#define WITH_IRIX_ARRAY 1" >>confdefs.h + + +printf "%s\n" "#define WITH_IRIX_PROJECT 1" >>confdefs.h + + +printf "%s\n" "#define WITH_IRIX_AUDIT 1" >>confdefs.h + + ac_fn_c_check_func "$LINENO" "jlimit_startjob" "ac_cv_func_jlimit_startjob" +if test "x$ac_cv_func_jlimit_startjob" = xyes +then : + +printf "%s\n" "#define WITH_IRIX_JOBS 1" >>confdefs.h + +fi + + printf "%s\n" "#define BROKEN_INET_NTOA 1" >>confdefs.h + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + +printf "%s\n" "#define BROKEN_UPDWTMPX 1" >>confdefs.h + + printf "%s\n" "#define WITH_ABBREV_NO_TTY 1" >>confdefs.h + + printf "%s\n" "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h + + ;; +*-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) + printf "%s\n" "#define PAM_TTY_KLUDGE 1" >>confdefs.h + + printf "%s\n" "#define LOCKED_PASSWD_PREFIX \"!\"" >>confdefs.h + + printf "%s\n" "#define SPT_TYPE SPT_REUSEARGV" >>confdefs.h + + +printf "%s\n" "#define _PATH_BTMP \"/var/log/btmp\"" >>confdefs.h + + +printf "%s\n" "#define USE_BTMP 1" >>confdefs.h + + ;; +*-*-linux*) + no_dev_ptmx=1 + use_pie=auto + check_for_openpty_ctty_bug=1 + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE" + +printf "%s\n" "#define BROKEN_CLOSEFROM 1" >>confdefs.h + + +printf "%s\n" "#define PAM_TTY_KLUDGE 1" >>confdefs.h + + +printf "%s\n" "#define LOCKED_PASSWD_PREFIX \"!\"" >>confdefs.h + + printf "%s\n" "#define SPT_TYPE SPT_REUSEARGV" >>confdefs.h + + +printf "%s\n" "#define LINK_OPNOTSUPP_ERRNO EPERM" >>confdefs.h + + +printf "%s\n" "#define _PATH_BTMP \"/var/log/btmp\"" >>confdefs.h + + printf "%s\n" "#define USE_BTMP 1" >>confdefs.h + + +printf "%s\n" "#define LINUX_OOM_ADJUST 1" >>confdefs.h + + +# Check whether --with-linux-memlock-onfault was given. +if test ${with_linux_memlock_onfault+y} +then : + withval=$with_linux_memlock_onfault; + if test "x$withval" != "xno" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MCL_ONFAULT" >&5 +printf %s "checking for MCL_ONFAULT... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + mlockall(MCL_FUTURE | MCL_ONFAULT); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: supported" >&5 +printf "%s\n" "supported" >&6; } + +printf "%s\n" "#define LINUX_MEMLOCK_ONFAULT 1" >>confdefs.h + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } + as_fn_error $? "MCL_ONFAULT is not available on your system" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +fi + + + +printf "%s\n" "#define SYSTEMD_NOTIFY 1" >>confdefs.h + + inet6_default_4in6=yes + case `uname -r` in + 1.*|2.0.*) + +printf "%s\n" "#define BROKEN_CMSG_TYPE 1" >>confdefs.h + + ;; + esac + # tun(4) forwarding compat code + ac_fn_c_check_header_compile "$LINENO" "linux/if_tun.h" "ac_cv_header_linux_if_tun_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_if_tun_h" = xyes +then : + printf "%s\n" "#define HAVE_LINUX_IF_TUN_H 1" >>confdefs.h + +fi + + if test "x$ac_cv_header_linux_if_tun_h" = "xyes" ; then + +printf "%s\n" "#define SSH_TUN_LINUX 1" >>confdefs.h + + +printf "%s\n" "#define SSH_TUN_COMPAT_AF 1" >>confdefs.h + + +printf "%s\n" "#define SSH_TUN_PREPEND_AF 1" >>confdefs.h + + fi + ac_fn_c_check_header_compile "$LINENO" "linux/if.h" "ac_cv_header_linux_if_h" " +#ifdef HAVE_SYS_TYPES_H +# include +#endif + +" +if test "x$ac_cv_header_linux_if_h" = xyes +then : + +printf "%s\n" "#define SYS_RDOMAIN_LINUX 1" >>confdefs.h + +fi + + ac_fn_c_check_header_compile "$LINENO" "linux/seccomp.h" "ac_cv_header_linux_seccomp_h" "#include +" +if test "x$ac_cv_header_linux_seccomp_h" = xyes +then : + printf "%s\n" "#define HAVE_LINUX_SECCOMP_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "linux/filter.h" "ac_cv_header_linux_filter_h" "#include +" +if test "x$ac_cv_header_linux_filter_h" = xyes +then : + printf "%s\n" "#define HAVE_LINUX_FILTER_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "linux/audit.h" "ac_cv_header_linux_audit_h" "#include +" +if test "x$ac_cv_header_linux_audit_h" = xyes +then : + printf "%s\n" "#define HAVE_LINUX_AUDIT_H 1" >>confdefs.h + +fi + + # Obtain MIPS ABI + case "$host" in + mips*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if _MIPS_SIM != _ABIO32 +#error +#endif + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + mips_abi="o32" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if _MIPS_SIM != _ABIN32 +#error +#endif + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + mips_abi="n32" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if _MIPS_SIM != _ABI64 +#error +#endif + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + mips_abi="n64" +else $as_nop + as_fn_error $? "unknown MIPS ABI" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; + esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for seccomp architecture" >&5 +printf %s "checking for seccomp architecture... " >&6; } + seccomp_audit_arch= + case "$host" in + x86_64-*) + seccomp_audit_arch=AUDIT_ARCH_X86_64 + ;; + i*86-*) + seccomp_audit_arch=AUDIT_ARCH_I386 + ;; + arm*-*) + seccomp_audit_arch=AUDIT_ARCH_ARM + ;; + aarch64*-*) + seccomp_audit_arch=AUDIT_ARCH_AARCH64 + ;; + s390x-*) + seccomp_audit_arch=AUDIT_ARCH_S390X + ;; + s390-*) + seccomp_audit_arch=AUDIT_ARCH_S390 + ;; + powerpc-*) + seccomp_audit_arch=AUDIT_ARCH_PPC + ;; + powerpc64-*) + seccomp_audit_arch=AUDIT_ARCH_PPC64 + ;; + powerpc64le-*) + seccomp_audit_arch=AUDIT_ARCH_PPC64LE + ;; + mips-*) + seccomp_audit_arch=AUDIT_ARCH_MIPS + ;; + mipsel-*) + seccomp_audit_arch=AUDIT_ARCH_MIPSEL + ;; + mips64-*) + case "$mips_abi" in + "n32") + seccomp_audit_arch=AUDIT_ARCH_MIPS64N32 + ;; + "n64") + seccomp_audit_arch=AUDIT_ARCH_MIPS64 + ;; + esac + ;; + mips64el-*) + case "$mips_abi" in + "n32") + seccomp_audit_arch=AUDIT_ARCH_MIPSEL64N32 + ;; + "n64") + seccomp_audit_arch=AUDIT_ARCH_MIPSEL64 + ;; + esac + ;; + riscv64-*) + seccomp_audit_arch=AUDIT_ARCH_RISCV64 + ;; + esac + if test "x$seccomp_audit_arch" != "x" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$seccomp_audit_arch\"" >&5 +printf "%s\n" "\"$seccomp_audit_arch\"" >&6; } + +printf "%s\n" "#define SECCOMP_AUDIT_ARCH $seccomp_audit_arch" >>confdefs.h + + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: architecture not supported" >&5 +printf "%s\n" "architecture not supported" >&6; } + fi + ;; +*-*-minix) + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + # poll(2) seems to choke on /dev/null; "Bad file descriptor" + +printf "%s\n" "#define BROKEN_POLL 1" >>confdefs.h + + ;; +mips-sony-bsd|mips-sony-newsos4) + +printf "%s\n" "#define NEED_SETPGRP 1" >>confdefs.h + + SONY=1 + ;; +*-*-netbsd*) + if test "x$withval" != "xno" ; then + rpath_opt="-R" + fi + CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE" + +printf "%s\n" "#define SSH_TUN_FREEBSD 1" >>confdefs.h + + ac_fn_c_check_header_compile "$LINENO" "net/if_tap.h" "ac_cv_header_net_if_tap_h" "$ac_includes_default" +if test "x$ac_cv_header_net_if_tap_h" = xyes +then : + +else $as_nop + +printf "%s\n" "#define SSH_TUN_NO_L2 1" >>confdefs.h + +fi + + +printf "%s\n" "#define SSH_TUN_PREPEND_AF 1" >>confdefs.h + + TEST_MALLOC_OPTIONS="AJRX" + +printf "%s\n" "#define BROKEN_READ_COMPARISON 1" >>confdefs.h + + ;; +*-*-freebsd*) + +printf "%s\n" "#define LOCKED_PASSWD_PREFIX \"*LOCKED*\"" >>confdefs.h + + +printf "%s\n" "#define SSH_TUN_FREEBSD 1" >>confdefs.h + + +printf "%s\n" "#define SSH_TUN_COMPAT_AF 1" >>confdefs.h + + ac_fn_c_check_header_compile "$LINENO" "net/if_tap.h" "ac_cv_header_net_if_tap_h" "$ac_includes_default" +if test "x$ac_cv_header_net_if_tap_h" = xyes +then : + +else $as_nop + +printf "%s\n" "#define SSH_TUN_NO_L2 1" >>confdefs.h + +fi + + broken_glob=yes # FreeBSD glob does not do what we need + TEST_MALLOC_OPTIONS="AJRX" + # Preauth crypto occasionally uses file descriptors for crypto offload + # and will crash if they cannot be opened. + +printf "%s\n" "#define SANDBOX_SKIP_RLIMIT_NOFILE 1" >>confdefs.h + + case "$host" in + *-*-freebsd9.*|*-*-freebsd10.*) + # Capsicum on 9 and 10 do not allow ppoll() so don't auto-enable. + disable_capsicum=yes + esac + ;; +*-*-bsdi*) + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + ;; +*-next-*) + conf_lastlog_location="/usr/adm/lastlog" + conf_utmp_location=/etc/utmp + conf_wtmp_location=/usr/adm/wtmp + maildir=/usr/spool/mail + +printf "%s\n" "#define HAVE_NEXT 1" >>confdefs.h + + printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + +printf "%s\n" "#define BROKEN_SAVED_UIDS 1" >>confdefs.h + + ;; +*-*-openbsd*) + use_pie=auto + +printf "%s\n" "#define HAVE_ATTRIBUTE__SENTINEL__ 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_ATTRIBUTE__BOUNDED__ 1" >>confdefs.h + + +printf "%s\n" "#define SSH_TUN_OPENBSD 1" >>confdefs.h + + +printf "%s\n" "#define SYSLOG_R_SAFE_IN_SIGHAND 1" >>confdefs.h + + TEST_MALLOC_OPTIONS="SJRU" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pledge(2) allows IP_TOS" >&5 +printf %s "checking whether pledge(2) allows IP_TOS... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: cannot test" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: cannot test" >&2;} +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include + +int +main (void) +{ + +int s, one = 1; +if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1) + err(1, "socket"); +if (pledge("stdio", NULL) == -1) + err(1, "pledge"); +if (setsockopt(s, IPPROTO_IP, IP_TOS, &one, sizeof(one)) == -1) + err(1, "setsockopt"); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + need_pledge_inet=1 + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + ;; +*-*-solaris*) + if test "x$withval" != "xno" ; then + rpath_opt="-R" + fi + printf "%s\n" "#define PAM_SUN_CODEBASE 1" >>confdefs.h + + printf "%s\n" "#define LOGIN_NEEDS_UTMPX 1" >>confdefs.h + + printf "%s\n" "#define PAM_TTY_KLUDGE 1" >>confdefs.h + + printf "%s\n" "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h + + # Pushing STREAMS modules will cause sshd to acquire a controlling tty. + +printf "%s\n" "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h + + +printf "%s\n" "#define PASSWD_NEEDS_USERNAME 1" >>confdefs.h + + +printf "%s\n" "#define BROKEN_TCGETATTR_ICANON 1" >>confdefs.h + + external_path_file=/etc/default/login + # hardwire lastlog location (can't detect it on some versions) + conf_lastlog_location="/var/adm/lastlog" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for obsolete utmp and wtmp in solaris2.x" >&5 +printf %s "checking for obsolete utmp and wtmp in solaris2.x... " >&6; } + sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'` + if test "$sol2ver" -ge 8; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define DISABLE_UTMP 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_WTMP 1" >>confdefs.h + + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + ac_fn_c_check_func "$LINENO" "setpflags" "ac_cv_func_setpflags" +if test "x$ac_cv_func_setpflags" = xyes +then : + printf "%s\n" "#define HAVE_SETPFLAGS 1" >>confdefs.h + +fi + + ac_fn_c_check_func "$LINENO" "setppriv" "ac_cv_func_setppriv" +if test "x$ac_cv_func_setppriv" = xyes +then : + printf "%s\n" "#define HAVE_SETPPRIV 1" >>confdefs.h + +fi + + ac_fn_c_check_func "$LINENO" "priv_basicset" "ac_cv_func_priv_basicset" +if test "x$ac_cv_func_priv_basicset" = xyes +then : + printf "%s\n" "#define HAVE_PRIV_BASICSET 1" >>confdefs.h + +fi + + ac_fn_c_check_header_compile "$LINENO" "priv.h" "ac_cv_header_priv_h" "$ac_includes_default" +if test "x$ac_cv_header_priv_h" = xyes +then : + printf "%s\n" "#define HAVE_PRIV_H 1" >>confdefs.h + +fi + + +# Check whether --with-solaris-contracts was given. +if test ${with_solaris_contracts+y} +then : + withval=$with_solaris_contracts; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ct_tmpl_activate in -lcontract" >&5 +printf %s "checking for ct_tmpl_activate in -lcontract... " >&6; } +if test ${ac_cv_lib_contract_ct_tmpl_activate+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcontract $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char ct_tmpl_activate (); +int +main (void) +{ +return ct_tmpl_activate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_contract_ct_tmpl_activate=yes +else $as_nop + ac_cv_lib_contract_ct_tmpl_activate=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_contract_ct_tmpl_activate" >&5 +printf "%s\n" "$ac_cv_lib_contract_ct_tmpl_activate" >&6; } +if test "x$ac_cv_lib_contract_ct_tmpl_activate" = xyes +then : + +printf "%s\n" "#define USE_SOLARIS_PROCESS_CONTRACTS 1" >>confdefs.h + + LIBS="$LIBS -lcontract" + SPC_MSG="yes" +fi + + +fi + + +# Check whether --with-solaris-projects was given. +if test ${with_solaris_projects+y} +then : + withval=$with_solaris_projects; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setproject in -lproject" >&5 +printf %s "checking for setproject in -lproject... " >&6; } +if test ${ac_cv_lib_project_setproject+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lproject $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char setproject (); +int +main (void) +{ +return setproject (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_project_setproject=yes +else $as_nop + ac_cv_lib_project_setproject=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_project_setproject" >&5 +printf "%s\n" "$ac_cv_lib_project_setproject" >&6; } +if test "x$ac_cv_lib_project_setproject" = xyes +then : + +printf "%s\n" "#define USE_SOLARIS_PROJECTS 1" >>confdefs.h + + LIBS="$LIBS -lproject" + SP_MSG="yes" +fi + + +fi + + +# Check whether --with-solaris-privs was given. +if test ${with_solaris_privs+y} +then : + withval=$with_solaris_privs; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Solaris/Illumos privilege support" >&5 +printf %s "checking for Solaris/Illumos privilege support... " >&6; } + if test "x$ac_cv_func_setppriv" = "xyes" -a \ + "x$ac_cv_header_priv_h" = "xyes" ; then + SOLARIS_PRIVS=yes + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 +printf "%s\n" "found" >&6; } + +printf "%s\n" "#define NO_UID_RESTORATION_TEST 1" >>confdefs.h + + +printf "%s\n" "#define USE_SOLARIS_PRIVS 1" >>confdefs.h + + SPP_MSG="yes" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + as_fn_error $? "*** must have support for Solaris privileges to use --with-solaris-privs" "$LINENO" 5 + fi + +fi + + TEST_SHELL=$SHELL # let configure find us a capable shell + ;; +*-*-sunos4*) + CPPFLAGS="$CPPFLAGS -DSUNOS4" + ac_fn_c_check_func "$LINENO" "getpwanam" "ac_cv_func_getpwanam" +if test "x$ac_cv_func_getpwanam" = xyes +then : + printf "%s\n" "#define HAVE_GETPWANAM 1" >>confdefs.h + +fi + + printf "%s\n" "#define PAM_SUN_CODEBASE 1" >>confdefs.h + + conf_utmp_location=/etc/utmp + conf_wtmp_location=/var/adm/wtmp + conf_lastlog_location=/var/adm/lastlog + printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_UTMPX 1" >>confdefs.h + + ;; +*-ncr-sysv*) + LIBS="$LIBS -lc89" + printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + printf "%s\n" "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + ;; +*-sni-sysv*) + # /usr/ucblib MUST NOT be searched on ReliantUNIX + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5 +printf %s "checking for dlsym in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlsym+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char dlsym (); +int +main (void) +{ +return dlsym (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_dl_dlsym=yes +else $as_nop + ac_cv_lib_dl_dlsym=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlsym" >&6; } +if test "x$ac_cv_lib_dl_dlsym" = xyes +then : + printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h + + LIBS="-ldl $LIBS" + +fi + + # -lresolv needs to be at the end of LIBS or DNS lookups break + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv" >&5 +printf %s "checking for res_query in -lresolv... " >&6; } +if test ${ac_cv_lib_resolv_res_query+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char res_query (); +int +main (void) +{ +return res_query (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_resolv_res_query=yes +else $as_nop + ac_cv_lib_resolv_res_query=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_query" >&5 +printf "%s\n" "$ac_cv_lib_resolv_res_query" >&6; } +if test "x$ac_cv_lib_resolv_res_query" = xyes +then : + LIBS="$LIBS -lresolv" +fi + + IPADDR_IN_DISPLAY=yes + printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + printf "%s\n" "#define IP_TOS_IS_BROKEN 1" >>confdefs.h + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + printf "%s\n" "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h + + external_path_file=/etc/default/login + # /usr/ucblib/libucb.a no longer needed on ReliantUNIX + # Attention: always take care to bind libsocket and libnsl before libc, + # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog + ;; +# UnixWare 1.x, UnixWare 2.x, and others based on code from Univel. +*-*-sysv4.2*) + printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + +printf "%s\n" "#define PASSWD_NEEDS_USERNAME 1" >>confdefs.h + + printf "%s\n" "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h + + TEST_SHELL=$SHELL # let configure find us a capable shell + ;; +# UnixWare 7.x, OpenUNIX 8 +*-*-sysv5*) + CPPFLAGS="$CPPFLAGS -Dvsnprintf=_xvsnprintf -Dsnprintf=_xsnprintf" + +printf "%s\n" "#define UNIXWARE_LONG_PASSWORDS 1" >>confdefs.h + + printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_GETADDRINFO 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + printf "%s\n" "#define PASSWD_NEEDS_USERNAME 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_TCGETATTR_ICANON 1" >>confdefs.h + + TEST_SHELL=$SHELL # let configure find us a capable shell + case "$host" in + *-*-sysv5SCO_SV*) # SCO OpenServer 6.x + maildir=/var/spool/mail + printf "%s\n" "#define BROKEN_UPDWTMPX 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getluid in -lprot" >&5 +printf %s "checking for getluid in -lprot... " >&6; } +if test ${ac_cv_lib_prot_getluid+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lprot $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char getluid (); +int +main (void) +{ +return getluid (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_prot_getluid=yes +else $as_nop + ac_cv_lib_prot_getluid=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_prot_getluid" >&5 +printf "%s\n" "$ac_cv_lib_prot_getluid" >&6; } +if test "x$ac_cv_lib_prot_getluid" = xyes +then : + LIBS="$LIBS -lprot" + ac_fn_c_check_func "$LINENO" "getluid" "ac_cv_func_getluid" +if test "x$ac_cv_func_getluid" = xyes +then : + printf "%s\n" "#define HAVE_GETLUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setluid" "ac_cv_func_setluid" +if test "x$ac_cv_func_setluid" = xyes +then : + printf "%s\n" "#define HAVE_SETLUID 1" >>confdefs.h + +fi + + +fi + + ;; + *) printf "%s\n" "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h + + ;; + esac + ;; +*-*-sysv*) + ;; +# SCO UNIX and OEM versions of SCO UNIX +*-*-sco3.2v4*) + as_fn_error $? "\"This Platform is no longer supported.\"" "$LINENO" 5 + ;; +# SCO OpenServer 5.x +*-*-sco3.2v5*) + if test -z "$GCC"; then + CFLAGS="$CFLAGS -belf" + fi + LIBS="$LIBS -lprot -lx -ltinfo -lm" + no_dev_ptmx=1 + printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + printf "%s\n" "#define HAVE_SECUREWARE 1" >>confdefs.h + + printf "%s\n" "#define DISABLE_SHADOW 1" >>confdefs.h + + printf "%s\n" "#define DISABLE_FD_PASSING 1" >>confdefs.h + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_GETADDRINFO 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + printf "%s\n" "#define WITH_ABBREV_NO_TTY 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_UPDWTMPX 1" >>confdefs.h + + printf "%s\n" "#define PASSWD_NEEDS_USERNAME 1" >>confdefs.h + + ac_fn_c_check_func "$LINENO" "getluid" "ac_cv_func_getluid" +if test "x$ac_cv_func_getluid" = xyes +then : + printf "%s\n" "#define HAVE_GETLUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setluid" "ac_cv_func_setluid" +if test "x$ac_cv_func_setluid" = xyes +then : + printf "%s\n" "#define HAVE_SETLUID 1" >>confdefs.h + +fi + + MANTYPE=man + TEST_SHELL=$SHELL # let configure find us a capable shell + SKIP_DISABLE_LASTLOG_DEFINE=yes + ;; +*-dec-osf*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Digital Unix SIA" >&5 +printf %s "checking for Digital Unix SIA... " >&6; } + no_osfsia="" + +# Check whether --with-osfsia was given. +if test ${with_osfsia+y} +then : + withval=$with_osfsia; + if test "x$withval" = "xno" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +printf "%s\n" "disabled" >&6; } + no_osfsia=1 + fi + +fi + + if test -z "$no_osfsia" ; then + if test -f /etc/sia/matrix.conf; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAVE_OSF_SIA 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_LOGIN 1" >>confdefs.h + + printf "%s\n" "#define DISABLE_FD_PASSING 1" >>confdefs.h + + LIBS="$LIBS -lsecurity -ldb -lm -laud" + SIA_MSG="yes" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define LOCKED_PASSWD_SUBSTR \"Nologin\"" >>confdefs.h + + fi + fi + printf "%s\n" "#define BROKEN_GETADDRINFO 1" >>confdefs.h + + printf "%s\n" "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREUID 1" >>confdefs.h + + printf "%s\n" "#define BROKEN_SETREGID 1" >>confdefs.h + + +printf "%s\n" "#define BROKEN_READV_COMPARISON 1" >>confdefs.h + + ;; + +*-*-nto-qnx*) + printf "%s\n" "#define USE_PIPES 1" >>confdefs.h + + printf "%s\n" "#define NO_X11_UNIX_SOCKETS 1" >>confdefs.h + + printf "%s\n" "#define DISABLE_LASTLOG 1" >>confdefs.h + + printf "%s\n" "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h + + +printf "%s\n" "#define BROKEN_SHADOW_EXPIRE 1" >>confdefs.h + + enable_etc_default_login=no # has incompatible /etc/default/login + case "$host" in + *-*-nto-qnx6*) + printf "%s\n" "#define DISABLE_FD_PASSING 1" >>confdefs.h + + ;; + esac + ;; + +*-*-ultrix*) + +printf "%s\n" "#define BROKEN_GETGROUPS 1" >>confdefs.h + + +printf "%s\n" "#define NEED_SETPGRP 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_SYS_SYSLOG_H 1" >>confdefs.h + + +printf "%s\n" "#define DISABLE_UTMPX 1" >>confdefs.h + + # DISABLE_FD_PASSING so that we call setpgrp as root, otherwise we + # don't get a controlling tty. + +printf "%s\n" "#define DISABLE_FD_PASSING 1" >>confdefs.h + + # On Ultrix some headers are not protected against multiple includes, + # so we create wrappers and put it where the compiler will find it. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: creating compat wrappers for headers" >&5 +printf "%s\n" "$as_me: WARNING: creating compat wrappers for headers" >&2;} + mkdir -p netinet + for header in netinet/ip.h netdb.h resolv.h; do + name=`echo $header | tr 'a-z/.' 'A-Z__'` + cat >$header <>confdefs.h + + ;; +*-*-gnu*) + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE" + ;; +esac + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking compiler and flags for sanity" >&5 +printf %s "checking compiler and flags for sanity... " >&6; } +if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking compiler sanity" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: not checking compiler sanity" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + exit(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + as_fn_error $? "*** compiler cannot create working executables, check config.log ***" "$LINENO" 5 + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +if test -z "$need_pledge_inet" ; then + printf "%s\n" "#define PLEDGE_EXTRA_INET /**/" >>confdefs.h + +else + +printf "%s\n" "#define PLEDGE_EXTRA_INET \"inet \"" >>confdefs.h + +fi + +# Checks for libraries. +ac_fn_c_check_func "$LINENO" "setsockopt" "ac_cv_func_setsockopt" +if test "x$ac_cv_func_setsockopt" = xyes +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lsocket" >&5 +printf %s "checking for setsockopt in -lsocket... " >&6; } +if test ${ac_cv_lib_socket_setsockopt+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char setsockopt (); +int +main (void) +{ +return setsockopt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_socket_setsockopt=yes +else $as_nop + ac_cv_lib_socket_setsockopt=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_setsockopt" >&5 +printf "%s\n" "$ac_cv_lib_socket_setsockopt" >&6; } +if test "x$ac_cv_lib_socket_setsockopt" = xyes +then : + printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h + + LIBS="-lsocket $LIBS" + +fi + +fi + + + + for ac_func in dirname +do : + ac_fn_c_check_func "$LINENO" "dirname" "ac_cv_func_dirname" +if test "x$ac_cv_func_dirname" = xyes +then : + printf "%s\n" "#define HAVE_DIRNAME 1" >>confdefs.h + ac_fn_c_check_header_compile "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default" +if test "x$ac_cv_header_libgen_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBGEN_H 1" >>confdefs.h + +fi + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dirname in -lgen" >&5 +printf %s "checking for dirname in -lgen... " >&6; } +if test ${ac_cv_lib_gen_dirname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgen $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char dirname (); +int +main (void) +{ +return dirname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_gen_dirname=yes +else $as_nop + ac_cv_lib_gen_dirname=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_dirname" >&5 +printf "%s\n" "$ac_cv_lib_gen_dirname" >&6; } +if test "x$ac_cv_lib_gen_dirname" = xyes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken dirname" >&5 +printf %s "checking for broken dirname... " >&6; } +if test ${ac_cv_have_broken_dirname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + save_LIBS="$LIBS" + LIBS="$LIBS -lgen" + if test "$cross_compiling" = yes +then : + ac_cv_have_broken_dirname="no" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int main(int argc, char **argv) { + char *s, buf[32]; + + strncpy(buf,"/etc", 32); + s = dirname(buf); + if (!s || strncmp(s, "/", 32) != 0) { + exit(1); + } else { + exit(0); + } +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + ac_cv_have_broken_dirname="no" +else $as_nop + ac_cv_have_broken_dirname="yes" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LIBS="$save_LIBS" + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_broken_dirname" >&5 +printf "%s\n" "$ac_cv_have_broken_dirname" >&6; } + if test "x$ac_cv_have_broken_dirname" = "xno" ; then + LIBS="$LIBS -lgen" + printf "%s\n" "#define HAVE_DIRNAME 1" >>confdefs.h + + ac_fn_c_check_header_compile "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default" +if test "x$ac_cv_header_libgen_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBGEN_H 1" >>confdefs.h + +fi + + fi + +fi + + +fi + +done + +ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam" +if test "x$ac_cv_func_getspnam" = xyes +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lgen" >&5 +printf %s "checking for getspnam in -lgen... " >&6; } +if test ${ac_cv_lib_gen_getspnam+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgen $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char getspnam (); +int +main (void) +{ +return getspnam (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_gen_getspnam=yes +else $as_nop + ac_cv_lib_gen_getspnam=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_getspnam" >&5 +printf "%s\n" "$ac_cv_lib_gen_getspnam" >&6; } +if test "x$ac_cv_lib_gen_getspnam" = xyes +then : + LIBS="$LIBS -lgen" +fi + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing basename" >&5 +printf %s "checking for library containing basename... " >&6; } +if test ${ac_cv_search_basename+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char basename (); +int +main (void) +{ +return basename (); + ; + return 0; +} +_ACEOF +for ac_lib in '' gen +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_basename=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_basename+y} +then : + break +fi +done +if test ${ac_cv_search_basename+y} +then : + +else $as_nop + ac_cv_search_basename=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_basename" >&5 +printf "%s\n" "$ac_cv_search_basename" >&6; } +ac_res=$ac_cv_search_basename +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +printf "%s\n" "#define HAVE_BASENAME 1" >>confdefs.h + +fi + + +ac_fn_c_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt" +if test "x$ac_cv_func_sqrt" = xyes +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 +printf %s "checking for sqrt in -lm... " >&6; } +if test ${ac_cv_lib_m_sqrt+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char sqrt (); +int +main (void) +{ +return sqrt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_m_sqrt=yes +else $as_nop + ac_cv_lib_m_sqrt=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 +printf "%s\n" "$ac_cv_lib_m_sqrt" >&6; } +if test "x$ac_cv_lib_m_sqrt" = xyes +then : + TESTLIBS="$TESTLIBS -lm" +fi + +fi + + + +zlib=yes + +# Check whether --with-zlib was given. +if test ${with_zlib+y} +then : + withval=$with_zlib; if test "x$withval" = "xno" ; then + zlib=no + elif test "x$withval" != "xyes"; then + if test -d "$withval/lib"; then + if test -n "${rpath_opt}"; then + LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}" + else + LDFLAGS="-L${withval}/lib ${LDFLAGS}" + fi + else + if test -n "${rpath_opt}"; then + LDFLAGS="-L${withval} ${rpath_opt}${withval} ${LDFLAGS}" + else + LDFLAGS="-L${withval} ${LDFLAGS}" + fi + fi + if test -d "$withval/include"; then + CPPFLAGS="-I${withval}/include ${CPPFLAGS}" + else + CPPFLAGS="-I${withval} ${CPPFLAGS}" + fi + fi + +fi + + +# These libraries are needed for anything that links in the channel code. +CHANNELLIBS="" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5 +printf %s "checking for zlib... " >&6; } +if test "x${zlib}" = "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +else + saved_LIBS="$LIBS" + CHANNELLIBS="$CHANNELLIBS -lz" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define WITH_ZLIB 1" >>confdefs.h + + ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = xyes +then : + +else $as_nop + as_fn_error $? "*** zlib.h missing - please install first or check config.log ***" "$LINENO" 5 +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 +printf %s "checking for deflate in -lz... " >&6; } +if test ${ac_cv_lib_z_deflate+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char deflate (); +int +main (void) +{ +return deflate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_z_deflate=yes +else $as_nop + ac_cv_lib_z_deflate=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 +printf "%s\n" "$ac_cv_lib_z_deflate" >&6; } +if test "x$ac_cv_lib_z_deflate" = xyes +then : + printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h + + LIBS="-lz $LIBS" + +else $as_nop + + saved_CPPFLAGS="$CPPFLAGS" + saved_LDFLAGS="$LDFLAGS" + if test -n "${rpath_opt}"; then + LDFLAGS="-L/usr/local/lib ${rpath_opt}/usr/local/lib ${saved_LDFLAGS}" + else + LDFLAGS="-L/usr/local/lib ${saved_LDFLAGS}" + fi + CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char deflate (); +int +main (void) +{ +return deflate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h + +else $as_nop + + as_fn_error $? "*** zlib missing - please install first or check config.log ***" "$LINENO" 5 + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + +fi + + + +# Check whether --with-zlib-version-check was given. +if test ${with_zlib_version_check+y} +then : + withval=$with_zlib_version_check; if test "x$withval" = "xno" ; then + zlib_check_nonfatal=1 + fi + + +fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for possibly buggy zlib" >&5 +printf %s "checking for possibly buggy zlib... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking zlib version" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: not checking zlib version" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main (void) +{ + + int a=0, b=0, c=0, d=0, n, v; + n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d); + if (n < 1) + exit(1); + v = a*1000000 + b*10000 + c*100 + d; + fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v); + + /* 1.1.4 is OK */ + if (a == 1 && b == 1 && c >= 4) + exit(0); + + /* 1.2.3 and up are OK */ + if (v >= 1020300) + exit(0); + + exit(2); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + if test -z "$zlib_check_nonfatal" ; then + as_fn_error $? "*** zlib too old - check config.log *** +Your reported zlib version has known security problems. It's possible your +vendor has fixed these problems without changing the version number. If you +are sure this is the case, you can disable the check by running +\"./configure --without-zlib-version-check\". +If you are in doubt, upgrade zlib to version 1.2.3 or greater. +See http://www.gzip.org/zlib/ for details." "$LINENO" 5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib version may have security problems" >&5 +printf "%s\n" "$as_me: WARNING: zlib version may have security problems" >&2;} + fi + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LIBS="$saved_LIBS" +fi + +ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" +if test "x$ac_cv_func_strcasecmp" = xyes +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strcasecmp in -lresolv" >&5 +printf %s "checking for strcasecmp in -lresolv... " >&6; } +if test ${ac_cv_lib_resolv_strcasecmp+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char strcasecmp (); +int +main (void) +{ +return strcasecmp (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_resolv_strcasecmp=yes +else $as_nop + ac_cv_lib_resolv_strcasecmp=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_strcasecmp" >&5 +printf "%s\n" "$ac_cv_lib_resolv_strcasecmp" >&6; } +if test "x$ac_cv_lib_resolv_strcasecmp" = xyes +then : + LIBS="$LIBS -lresolv" +fi + + +fi + + + for ac_func in utimes +do : + ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes" +if test "x$ac_cv_func_utimes" = xyes +then : + printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utimes in -lc89" >&5 +printf %s "checking for utimes in -lc89... " >&6; } +if test ${ac_cv_lib_c89_utimes+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc89 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char utimes (); +int +main (void) +{ +return utimes (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_c89_utimes=yes +else $as_nop + ac_cv_lib_c89_utimes=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c89_utimes" >&5 +printf "%s\n" "$ac_cv_lib_c89_utimes" >&6; } +if test "x$ac_cv_lib_c89_utimes" = xyes +then : + printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h + + LIBS="$LIBS -lc89" +fi + + +fi + +done + +ac_fn_c_check_header_compile "$LINENO" "bsd/libutil.h" "ac_cv_header_bsd_libutil_h" "$ac_includes_default" +if test "x$ac_cv_header_bsd_libutil_h" = xyes +then : + printf "%s\n" "#define HAVE_BSD_LIBUTIL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default" +if test "x$ac_cv_header_libutil_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBUTIL_H 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing fmt_scaled" >&5 +printf %s "checking for library containing fmt_scaled... " >&6; } +if test ${ac_cv_search_fmt_scaled+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char fmt_scaled (); +int +main (void) +{ +return fmt_scaled (); + ; + return 0; +} +_ACEOF +for ac_lib in '' util bsd +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_fmt_scaled=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_fmt_scaled+y} +then : + break +fi +done +if test ${ac_cv_search_fmt_scaled+y} +then : + +else $as_nop + ac_cv_search_fmt_scaled=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fmt_scaled" >&5 +printf "%s\n" "$ac_cv_search_fmt_scaled" >&6; } +ac_res=$ac_cv_search_fmt_scaled +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing scan_scaled" >&5 +printf %s "checking for library containing scan_scaled... " >&6; } +if test ${ac_cv_search_scan_scaled+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char scan_scaled (); +int +main (void) +{ +return scan_scaled (); + ; + return 0; +} +_ACEOF +for ac_lib in '' util bsd +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_scan_scaled=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_scan_scaled+y} +then : + break +fi +done +if test ${ac_cv_search_scan_scaled+y} +then : + +else $as_nop + ac_cv_search_scan_scaled=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_scan_scaled" >&5 +printf "%s\n" "$ac_cv_search_scan_scaled" >&6; } +ac_res=$ac_cv_search_scan_scaled +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing login" >&5 +printf %s "checking for library containing login... " >&6; } +if test ${ac_cv_search_login+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char login (); +int +main (void) +{ +return login (); + ; + return 0; +} +_ACEOF +for ac_lib in '' util bsd +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_login=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_login+y} +then : + break +fi +done +if test ${ac_cv_search_login+y} +then : + +else $as_nop + ac_cv_search_login=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_login" >&5 +printf "%s\n" "$ac_cv_search_login" >&6; } +ac_res=$ac_cv_search_login +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing logout" >&5 +printf %s "checking for library containing logout... " >&6; } +if test ${ac_cv_search_logout+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char logout (); +int +main (void) +{ +return logout (); + ; + return 0; +} +_ACEOF +for ac_lib in '' util bsd +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_logout=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_logout+y} +then : + break +fi +done +if test ${ac_cv_search_logout+y} +then : + +else $as_nop + ac_cv_search_logout=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_logout" >&5 +printf "%s\n" "$ac_cv_search_logout" >&6; } +ac_res=$ac_cv_search_logout +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing logwtmp" >&5 +printf %s "checking for library containing logwtmp... " >&6; } +if test ${ac_cv_search_logwtmp+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char logwtmp (); +int +main (void) +{ +return logwtmp (); + ; + return 0; +} +_ACEOF +for ac_lib in '' util bsd +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_logwtmp=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_logwtmp+y} +then : + break +fi +done +if test ${ac_cv_search_logwtmp+y} +then : + +else $as_nop + ac_cv_search_logwtmp=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_logwtmp" >&5 +printf "%s\n" "$ac_cv_search_logwtmp" >&6; } +ac_res=$ac_cv_search_logwtmp +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing openpty" >&5 +printf %s "checking for library containing openpty... " >&6; } +if test ${ac_cv_search_openpty+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char openpty (); +int +main (void) +{ +return openpty (); + ; + return 0; +} +_ACEOF +for ac_lib in '' util bsd +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_openpty=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_openpty+y} +then : + break +fi +done +if test ${ac_cv_search_openpty+y} +then : + +else $as_nop + ac_cv_search_openpty=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_openpty" >&5 +printf "%s\n" "$ac_cv_search_openpty" >&6; } +ac_res=$ac_cv_search_openpty +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing updwtmp" >&5 +printf %s "checking for library containing updwtmp... " >&6; } +if test ${ac_cv_search_updwtmp+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char updwtmp (); +int +main (void) +{ +return updwtmp (); + ; + return 0; +} +_ACEOF +for ac_lib in '' util bsd +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_updwtmp=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_updwtmp+y} +then : + break +fi +done +if test ${ac_cv_search_updwtmp+y} +then : + +else $as_nop + ac_cv_search_updwtmp=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_updwtmp" >&5 +printf "%s\n" "$ac_cv_search_updwtmp" >&6; } +ac_res=$ac_cv_search_updwtmp +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +ac_fn_c_check_func "$LINENO" "fmt_scaled" "ac_cv_func_fmt_scaled" +if test "x$ac_cv_func_fmt_scaled" = xyes +then : + printf "%s\n" "#define HAVE_FMT_SCALED 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "scan_scaled" "ac_cv_func_scan_scaled" +if test "x$ac_cv_func_scan_scaled" = xyes +then : + printf "%s\n" "#define HAVE_SCAN_SCALED 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "login" "ac_cv_func_login" +if test "x$ac_cv_func_login" = xyes +then : + printf "%s\n" "#define HAVE_LOGIN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "logout" "ac_cv_func_logout" +if test "x$ac_cv_func_logout" = xyes +then : + printf "%s\n" "#define HAVE_LOGOUT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty" +if test "x$ac_cv_func_openpty" = xyes +then : + printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "updwtmp" "ac_cv_func_updwtmp" +if test "x$ac_cv_func_updwtmp" = xyes +then : + printf "%s\n" "#define HAVE_UPDWTMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "logwtmp" "ac_cv_func_logwtmp" +if test "x$ac_cv_func_logwtmp" = xyes +then : + printf "%s\n" "#define HAVE_LOGWTMP 1" >>confdefs.h + +fi + + +# On some platforms, inet_ntop and gethostbyname may be found in libresolv +# or libnsl. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 +printf %s "checking for library containing inet_ntop... " >&6; } +if test ${ac_cv_search_inet_ntop+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char inet_ntop (); +int +main (void) +{ +return inet_ntop (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv nsl +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_inet_ntop=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_inet_ntop+y} +then : + break +fi +done +if test ${ac_cv_search_inet_ntop+y} +then : + +else $as_nop + ac_cv_search_inet_ntop=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 +printf "%s\n" "$ac_cv_search_inet_ntop" >&6; } +ac_res=$ac_cv_search_inet_ntop +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 +printf %s "checking for library containing gethostbyname... " >&6; } +if test ${ac_cv_search_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main (void) +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv nsl +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_gethostbyname=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_gethostbyname+y} +then : + break +fi +done +if test ${ac_cv_search_gethostbyname+y} +then : + +else $as_nop + ac_cv_search_gethostbyname=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 +printf "%s\n" "$ac_cv_search_gethostbyname" >&6; } +ac_res=$ac_cv_search_gethostbyname +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + +# Some Linux distribtions ship the BSD libc hashing functions in +# separate libraries. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256Update" >&5 +printf %s "checking for library containing SHA256Update... " >&6; } +if test ${ac_cv_search_SHA256Update+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char SHA256Update (); +int +main (void) +{ +return SHA256Update (); + ; + return 0; +} +_ACEOF +for ac_lib in '' md bsd +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_SHA256Update=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_SHA256Update+y} +then : + break +fi +done +if test ${ac_cv_search_SHA256Update+y} +then : + +else $as_nop + ac_cv_search_SHA256Update=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256Update" >&5 +printf "%s\n" "$ac_cv_search_SHA256Update" >&6; } +ac_res=$ac_cv_search_SHA256Update +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + +# "Particular Function Checks" +# see https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Functions.html + + for ac_func in strftime +do : + ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" +if test "x$ac_cv_func_strftime" = xyes +then : + printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h + +else $as_nop + # strftime is in -lintl on SCO UNIX. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 +printf %s "checking for strftime in -lintl... " >&6; } +if test ${ac_cv_lib_intl_strftime+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char strftime (); +int +main (void) +{ +return strftime (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_intl_strftime=yes +else $as_nop + ac_cv_lib_intl_strftime=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 +printf "%s\n" "$ac_cv_lib_intl_strftime" >&6; } +if test "x$ac_cv_lib_intl_strftime" = xyes +then : + printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h + +LIBS="-lintl $LIBS" +fi + +fi + +done +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 +printf %s "checking for GNU libc compatible malloc... " >&6; } +if test ${ac_cv_func_malloc_0_nonnull+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : + case "$host_os" in # (( + # Guess yes on platforms where we know the result. + *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ + | hpux* | solaris* | cygwin* | mingw* | msys* ) + ac_cv_func_malloc_0_nonnull=yes ;; + # If we don't know, assume the worst. + *) ac_cv_func_malloc_0_nonnull=no ;; + esac +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main (void) +{ +void *p = malloc (0); + int result = !p; + free (p); + return result; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + ac_cv_func_malloc_0_nonnull=yes +else $as_nop + ac_cv_func_malloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; } +if test $ac_cv_func_malloc_0_nonnull = yes +then : + +printf "%s\n" "#define HAVE_MALLOC 1" >>confdefs.h + +else $as_nop + printf "%s\n" "#define HAVE_MALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" malloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" + ;; +esac + + +printf "%s\n" "#define malloc rpl_malloc" >>confdefs.h + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 +printf %s "checking for GNU libc compatible realloc... " >&6; } +if test ${ac_cv_func_realloc_0_nonnull+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : + case "$host_os" in # (( + # Guess yes on platforms where we know the result. + *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ + | hpux* | solaris* | cygwin* | mingw* | msys* ) + ac_cv_func_realloc_0_nonnull=yes ;; + # If we don't know, assume the worst. + *) ac_cv_func_realloc_0_nonnull=no ;; + esac +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main (void) +{ +void *p = realloc (0, 0); + int result = !p; + free (p); + return result; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + ac_cv_func_realloc_0_nonnull=yes +else $as_nop + ac_cv_func_realloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 +printf "%s\n" "$ac_cv_func_realloc_0_nonnull" >&6; } +if test $ac_cv_func_realloc_0_nonnull = yes +then : + +printf "%s\n" "#define HAVE_REALLOC 1" >>confdefs.h + +else $as_nop + printf "%s\n" "#define HAVE_REALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" realloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS realloc.$ac_objext" + ;; +esac + + +printf "%s\n" "#define realloc rpl_realloc" >>confdefs.h + +fi + + +# autoconf doesn't have AC_FUNC_CALLOC so fake it if malloc returns NULL; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if calloc(0, N) returns non-null" >&5 +printf %s "checking if calloc(0, N) returns non-null... " >&6; } +if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming same as malloc" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming same as malloc" >&2;} + func_calloc_0_nonnull="$ac_cv_func_malloc_0_nonnull" + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + void *p = calloc(0, 1); exit(p == NULL); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + func_calloc_0_nonnull=yes +else $as_nop + func_calloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $func_calloc_0_nonnull" >&5 +printf "%s\n" "$func_calloc_0_nonnull" >&6; } + +if test "x$func_calloc_0_nonnull" = "xyes"; then + +printf "%s\n" "#define HAVE_CALLOC 1" >>confdefs.h + +else + +printf "%s\n" "#define HAVE_CALLOC 0" >>confdefs.h + + +printf "%s\n" "#define calloc rpl_calloc" >>confdefs.h + +fi + + + for ac_func in glob +do : + ac_fn_c_check_func "$LINENO" "glob" "ac_cv_func_glob" +if test "x$ac_cv_func_glob" = xyes +then : + printf "%s\n" "#define HAVE_GLOB 1" >>confdefs.h + for ac_header in glob.h +do : + ac_fn_c_check_header_compile "$LINENO" "glob.h" "ac_cv_header_glob_h" "$ac_includes_default" +if test "x$ac_cv_header_glob_h" = xyes +then : + printf "%s\n" "#define HAVE_GLOB_H 1" >>confdefs.h + use_system_glob=yes +else $as_nop + use_system_glob=no +fi + +done + +else $as_nop + use_system_glob=no + +fi + +done + +# Check for ALTDIRFUNC glob() extension +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLOB_ALTDIRFUNC support" >&5 +printf %s "checking for GLOB_ALTDIRFUNC support... " >&6; } + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #ifdef GLOB_ALTDIRFUNC + FOUNDIT + #endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "FOUNDIT" >/dev/null 2>&1 +then : + + +printf "%s\n" "#define GLOB_HAS_ALTDIRFUNC 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + use_system_glob=no + + +fi +rm -rf conftest* + + +# Check for g.gl_matchc glob() extension +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gl_matchc field in glob_t" >&5 +printf %s "checking for gl_matchc field in glob_t... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + glob_t g; g.gl_matchc = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + +printf "%s\n" "#define GLOB_HAS_GL_MATCHC 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + use_system_glob=no + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +# Check for g.gl_statv glob() extension +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gl_statv and GLOB_KEEPSTAT extensions for glob" >&5 +printf %s "checking for gl_statv and GLOB_KEEPSTAT extensions for glob... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + +#ifndef GLOB_KEEPSTAT +#error "glob does not support GLOB_KEEPSTAT extension" +#endif +glob_t g; +g.gl_statv = NULL; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + +printf "%s\n" "#define GLOB_HAS_GL_STATV 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + use_system_glob=no + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +ac_fn_check_decl "$LINENO" "GLOB_NOMATCH" "ac_cv_have_decl_GLOB_NOMATCH" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_GLOB_NOMATCH" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_GLOB_NOMATCH $ac_have_decl" >>confdefs.h +if test $ac_have_decl = 1 +then : + +else $as_nop + use_system_glob=no +fi + + +if test "x$broken_glob" = "xyes"; then + +printf "%s\n" "#define BROKEN_GLOB 1" >>confdefs.h + + use_system_glob=no +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can use the system glob" >&5 +printf %s "checking if we can use the system glob... " >&6; } +if test "x$use_system_glob" = "xyes" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + # Remove any old shims. + rm -f "$COMPATINCLUDESDIR/glob.h" +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + COMPATINCLUDES="$COMPATINCLUDESDIR" + mkdir -p "$COMPATINCLUDES" + echo '#include "openbsd-compat/glob.h"' >$COMPATINCLUDES/glob.h +fi + +ac_fn_check_decl "$LINENO" "VIS_ALL" "ac_cv_have_decl_VIS_ALL" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_VIS_ALL" = xyes +then : + +else $as_nop + +printf "%s\n" "#define BROKEN_STRNVIS 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct dirent allocates space for d_name" >&5 +printf %s "checking whether struct dirent allocates space for d_name... " >&6; } +if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME" >&2;} + printf "%s\n" "#define BROKEN_ONE_BYTE_DIRENT_D_NAME 1" >>confdefs.h + + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main (void) +{ + + struct dirent d; + exit(sizeof(d.d_name)<=sizeof(char)); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define BROKEN_ONE_BYTE_DIRENT_D_NAME 1" >>confdefs.h + + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +ac_fn_c_check_member "$LINENO" "struct dirent" "d_type" "ac_cv_member_struct_dirent_d_type" " +#ifdef HAVE_DIRENT_H +#include +#endif + +" +if test "x$ac_cv_member_struct_dirent_d_type" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_DIRENT_D_TYPE 1" >>confdefs.h + + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /proc/pid/fd directory" >&5 +printf %s "checking for /proc/pid/fd directory... " >&6; } +if test -d "/proc/$$/fd" ; then + +printf "%s\n" "#define HAVE_PROC_PID 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + +# Check whether user wants to use ldns +LDNS_MSG="no" + +# Check whether --with-ldns was given. +if test ${with_ldns+y} +then : + withval=$with_ldns; + ldns="" + if test "x$withval" = "xyes" ; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ldns-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}ldns-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_LDNSCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $LDNSCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_LDNSCONFIG="$LDNSCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_LDNSCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +LDNSCONFIG=$ac_cv_path_LDNSCONFIG +if test -n "$LDNSCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDNSCONFIG" >&5 +printf "%s\n" "$LDNSCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_LDNSCONFIG"; then + ac_pt_LDNSCONFIG=$LDNSCONFIG + # Extract the first word of "ldns-config", so it can be a program name with args. +set dummy ldns-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_LDNSCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ac_pt_LDNSCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_LDNSCONFIG="$ac_pt_LDNSCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_LDNSCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_LDNSCONFIG=$ac_cv_path_ac_pt_LDNSCONFIG +if test -n "$ac_pt_LDNSCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LDNSCONFIG" >&5 +printf "%s\n" "$ac_pt_LDNSCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_LDNSCONFIG" = x; then + LDNSCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LDNSCONFIG=$ac_pt_LDNSCONFIG + fi +else + LDNSCONFIG="$ac_cv_path_LDNSCONFIG" +fi + + if test "x$LDNSCONFIG" = "xno"; then + LIBS="-lldns $LIBS" + ldns=yes + else + LIBS="$LIBS `$LDNSCONFIG --libs`" + CPPFLAGS="$CPPFLAGS `$LDNSCONFIG --cflags`" + ldns=yes + fi + elif test "x$withval" != "xno" ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + LDFLAGS="$LDFLAGS -L${withval}/lib" + LIBS="-lldns $LIBS" + ldns=yes + fi + + # Verify that it works. + if test "x$ldns" = "xyes" ; then + +printf "%s\n" "#define HAVE_LDNS 1" >>confdefs.h + + LDNS_MSG="yes" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ldns support" >&5 +printf %s "checking for ldns support... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#ifdef HAVE_STDINT_H +# include +#endif +#include +int main(void) { ldns_status status = ldns_verify_trusted(NULL, NULL, NULL, NULL); status=LDNS_STATUS_OK; exit(0); } + + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + as_fn_error $? "** Incomplete or missing ldns libraries." "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + +fi + + +# Check whether user wants libedit support +LIBEDIT_MSG="no" + +# Check whether --with-libedit was given. +if test ${with_libedit+y} +then : + withval=$with_libedit; if test "x$withval" != "xno" ; then + if test "x$withval" = "xyes" ; then + if test "x$PKGCONFIG" != "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $PKGCONFIG knows about libedit" >&5 +printf %s "checking if $PKGCONFIG knows about libedit... " >&6; } + if "$PKGCONFIG" libedit; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + use_pkgconfig_for_libedit=yes + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + fi + else + CPPFLAGS="$CPPFLAGS -I${withval}/include" + if test -n "${rpath_opt}"; then + LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}" + else + LDFLAGS="-L${withval}/lib ${LDFLAGS}" + fi + fi + if test "x$use_pkgconfig_for_libedit" = "xyes"; then + LIBEDIT=`$PKGCONFIG --libs libedit` + CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" + else + LIBEDIT="-ledit -lcurses" + fi + OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for el_init in -ledit" >&5 +printf %s "checking for el_init in -ledit... " >&6; } +if test ${ac_cv_lib_edit_el_init+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-ledit $OTHERLIBS + $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char el_init (); +int +main (void) +{ +return el_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_edit_el_init=yes +else $as_nop + ac_cv_lib_edit_el_init=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_el_init" >&5 +printf "%s\n" "$ac_cv_lib_edit_el_init" >&6; } +if test "x$ac_cv_lib_edit_el_init" = xyes +then : + +printf "%s\n" "#define USE_LIBEDIT 1" >>confdefs.h + + LIBEDIT_MSG="yes" + + +else $as_nop + as_fn_error $? "libedit not found" "$LINENO" 5 +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libedit version is compatible" >&5 +printf %s "checking if libedit version is compatible... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + + int i = H_SETSIZE; + el_init("", NULL, NULL, NULL); + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + as_fn_error $? "libedit version is not compatible" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +fi + + +# Check whether user wants wtmpdb support +WTMPDB_MSG="no" + +# Check whether --with-wtmpdb was given. +if test ${with_wtmpdb+y} +then : + withval=$with_wtmpdb; if test "x$withval" != "xno" ; then + if test "x$withval" = "xyes" ; then + if test "x$PKGCONFIG" != "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $PKGCONFIG knows about wtmpdb" >&5 +printf %s "checking if $PKGCONFIG knows about wtmpdb... " >&6; } + if "$PKGCONFIG" libwtmpdb; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + use_pkgconfig_for_libwtmpdb=yes + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + fi + else + CPPFLAGS="$CPPFLAGS -I${withval}/include" + if test -n "${rpath_opt}"; then + LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}" + else + LDFLAGS="-L${withval}/lib ${LDFLAGS}" + fi + fi + if test "x$use_pkgconfig_for_libwtmpdb" = "xyes"; then + LIBWTMPDB=`$PKGCONFIG --libs libwtmpdb` + CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libwtmpdb`" + else + LIBWTMPDB="-lwtmpdb" + fi + OTHERLIBS=`echo $LIBWTMPDB | sed 's/-lwtmpdb//'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wtmpdb_login in -lwtmpdb" >&5 +printf %s "checking for wtmpdb_login in -lwtmpdb... " >&6; } +if test ${ac_cv_lib_wtmpdb_wtmpdb_login+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lwtmpdb $OTHERLIBS + $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char wtmpdb_login (); +int +main (void) +{ +return wtmpdb_login (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_wtmpdb_wtmpdb_login=yes +else $as_nop + ac_cv_lib_wtmpdb_wtmpdb_login=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wtmpdb_wtmpdb_login" >&5 +printf "%s\n" "$ac_cv_lib_wtmpdb_wtmpdb_login" >&6; } +if test "x$ac_cv_lib_wtmpdb_wtmpdb_login" = xyes +then : + +printf "%s\n" "#define USE_WTMPDB 1" >>confdefs.h + + WTMPDB_MSG="yes" + + +else $as_nop + as_fn_error $? "libwtmpdb not found" "$LINENO" 5 +fi + + fi + +fi + + + +AUDIT_MODULE=none + +# Check whether --with-audit was given. +if test ${with_audit+y} +then : + withval=$with_audit; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for supported audit module" >&5 +printf %s "checking for supported audit module... " >&6; } + case "$withval" in + bsm) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: bsm" >&5 +printf "%s\n" "bsm" >&6; } + AUDIT_MODULE=bsm + for ac_header in bsm/audit.h +do : + ac_fn_c_check_header_compile "$LINENO" "bsm/audit.h" "ac_cv_header_bsm_audit_h" " +#ifdef HAVE_TIME_H +# include +#endif + + +" +if test "x$ac_cv_header_bsm_audit_h" = xyes +then : + printf "%s\n" "#define HAVE_BSM_AUDIT_H 1" >>confdefs.h + +else $as_nop + as_fn_error $? "BSM enabled and bsm/audit.h not found" "$LINENO" 5 +fi + +done + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaudit in -lbsm" >&5 +printf %s "checking for getaudit in -lbsm... " >&6; } +if test ${ac_cv_lib_bsm_getaudit+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char getaudit (); +int +main (void) +{ +return getaudit (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_bsm_getaudit=yes +else $as_nop + ac_cv_lib_bsm_getaudit=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsm_getaudit" >&5 +printf "%s\n" "$ac_cv_lib_bsm_getaudit" >&6; } +if test "x$ac_cv_lib_bsm_getaudit" = xyes +then : + printf "%s\n" "#define HAVE_LIBBSM 1" >>confdefs.h + + LIBS="-lbsm $LIBS" + +else $as_nop + as_fn_error $? "BSM enabled and required library not found" "$LINENO" 5 +fi + + + for ac_func in getaudit +do : + ac_fn_c_check_func "$LINENO" "getaudit" "ac_cv_func_getaudit" +if test "x$ac_cv_func_getaudit" = xyes +then : + printf "%s\n" "#define HAVE_GETAUDIT 1" >>confdefs.h + +else $as_nop + as_fn_error $? "BSM enabled and required function not found" "$LINENO" 5 +fi + +done + # These are optional + ac_fn_c_check_func "$LINENO" "getaudit_addr" "ac_cv_func_getaudit_addr" +if test "x$ac_cv_func_getaudit_addr" = xyes +then : + printf "%s\n" "#define HAVE_GETAUDIT_ADDR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "aug_get_machine" "ac_cv_func_aug_get_machine" +if test "x$ac_cv_func_aug_get_machine" = xyes +then : + printf "%s\n" "#define HAVE_AUG_GET_MACHINE 1" >>confdefs.h + +fi + + +printf "%s\n" "#define USE_BSM_AUDIT 1" >>confdefs.h + + if test "$sol2ver" -ge 11; then + SSHDLIBS="$SSHDLIBS -lscf" + +printf "%s\n" "#define BROKEN_BSM_API 1" >>confdefs.h + + fi + ;; + linux) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: linux" >&5 +printf "%s\n" "linux" >&6; } + AUDIT_MODULE=linux + ac_fn_c_check_header_compile "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default" +if test "x$ac_cv_header_libaudit_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBAUDIT_H 1" >>confdefs.h + +fi + + SSHDLIBS="$SSHDLIBS -laudit" + +printf "%s\n" "#define USE_LINUX_AUDIT 1" >>confdefs.h + + ;; + debug) + AUDIT_MODULE=debug + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: debug" >&5 +printf "%s\n" "debug" >&6; } + +printf "%s\n" "#define SSH_AUDIT_EVENTS 1" >>confdefs.h + + ;; + no) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; + *) + as_fn_error $? "Unknown audit module $withval" "$LINENO" 5 + ;; + esac + +fi + + + +# Check whether --with-pie was given. +if test ${with_pie+y} +then : + withval=$with_pie; + if test "x$withval" = "xno"; then + use_pie=no + fi + if test "x$withval" = "xyes"; then + use_pie=yes + fi + + +fi + +if test "x$use_pie" = "x"; then + use_pie=no +fi +if test "x$use_toolchain_hardening" != "x1" && test "x$use_pie" = "xauto"; then + # Turn off automatic PIE when toolchain hardening is off. + use_pie=no +fi +if test "x$use_pie" = "xauto"; then + # Automatic PIE requires gcc >= 4.x + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gcc >= 4.x" >&5 +printf %s "checking for gcc >= 4.x... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if !defined(__GNUC__) || __GNUC__ < 4 +#error gcc is too old +#endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + use_pie=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +if test "x$use_pie" != "xno"; then + SAVED_CFLAGS="$CFLAGS" + SAVED_LDFLAGS="$LDFLAGS" + { + ossh_cache_var=ossh_cv_cflag__fPIE + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -fPIE" >&5 +printf %s "checking if $CC supports compile flag -fPIE... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR -fPIE" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-fPIE" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + CFLAGS="$saved_CFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + CFLAGS="$saved_CFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + CFLAGS="$saved_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + { + ossh_cache_var=ossh_cv_ldflag__pie + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -pie" >&5 +printf %s "checking if $LD supports link flag -pie... " >&6; } +if eval test \${$ossh_cache_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $WERROR -pie" + _define_flag="" + test "x$_define_flag" = "x" && _define_flag="-pie" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null +then + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" +else + if test "$cross_compiling" = yes +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +/* Trivial function to help test for -fzero-call-used-regs */ +int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} +int i; +double d; +const char *f3(int s) { + i = (int)d; + return s ? "good" : "gooder"; +} +int main(int argc, char **argv) { + char b[256], *cp; + const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; + (void)argv; + f(1); + s = f3(f(2)); + snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does + * not understand comments and we don't use the "fallthrough" attribute + * that it's looking for. + */ + switch(i){ + case 0: j += i; + /* FALLTHROUGH */ + default: j += k; + } + exit(0); +} + + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + eval "$ossh_cache_var=yes" + LDFLAGS="$saved_LDFLAGS $_define_flag" +else $as_nop + eval "$ossh_cache_var='no, fails at run time'" + LDFLAGS="$saved_LDFLAGS" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +else $as_nop + eval "$ossh_cache_var=no" + LDFLAGS="$saved_LDFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +eval ac_res=\$$ossh_cache_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +} + # We use both -fPIE and -pie or neither. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether both -fPIE and -pie are supported" >&5 +printf %s "checking whether both -fPIE and -pie are supported... " >&6; } + if echo "x $CFLAGS" | grep ' -fPIE' >/dev/null 2>&1 && \ + echo "x $LDFLAGS" | grep ' -pie' >/dev/null 2>&1 ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + CFLAGS="$SAVED_CFLAGS" + LDFLAGS="$SAVED_LDFLAGS" + fi +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -fPIC is accepted" >&5 +printf %s "checking whether -fPIC is accepted... " >&6; } +SAVED_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fPIC" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + exit(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + PICFLAG="-fPIC"; +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + PICFLAG=""; +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CFLAGS="$SAVED_CFLAGS" + + +ac_fn_c_check_func "$LINENO" "auth_hostok" "ac_cv_func_auth_hostok" +if test "x$ac_cv_func_auth_hostok" = xyes +then : + printf "%s\n" "#define HAVE_AUTH_HOSTOK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "auth_timeok" "ac_cv_func_auth_timeok" +if test "x$ac_cv_func_auth_timeok" = xyes +then : + printf "%s\n" "#define HAVE_AUTH_TIMEOK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "Blowfish_initstate" "ac_cv_func_Blowfish_initstate" +if test "x$ac_cv_func_Blowfish_initstate" = xyes +then : + printf "%s\n" "#define HAVE_BLOWFISH_INITSTATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "Blowfish_expandstate" "ac_cv_func_Blowfish_expandstate" +if test "x$ac_cv_func_Blowfish_expandstate" = xyes +then : + printf "%s\n" "#define HAVE_BLOWFISH_EXPANDSTATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "Blowfish_expand0state" "ac_cv_func_Blowfish_expand0state" +if test "x$ac_cv_func_Blowfish_expand0state" = xyes +then : + printf "%s\n" "#define HAVE_BLOWFISH_EXPAND0STATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "Blowfish_stream2word" "ac_cv_func_Blowfish_stream2word" +if test "x$ac_cv_func_Blowfish_stream2word" = xyes +then : + printf "%s\n" "#define HAVE_BLOWFISH_STREAM2WORD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "SHA256Update" "ac_cv_func_SHA256Update" +if test "x$ac_cv_func_SHA256Update" = xyes +then : + printf "%s\n" "#define HAVE_SHA256UPDATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "SHA384Update" "ac_cv_func_SHA384Update" +if test "x$ac_cv_func_SHA384Update" = xyes +then : + printf "%s\n" "#define HAVE_SHA384UPDATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "SHA512Update" "ac_cv_func_SHA512Update" +if test "x$ac_cv_func_SHA512Update" = xyes +then : + printf "%s\n" "#define HAVE_SHA512UPDATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf" +if test "x$ac_cv_func_asprintf" = xyes +then : + printf "%s\n" "#define HAVE_ASPRINTF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "b64_ntop" "ac_cv_func_b64_ntop" +if test "x$ac_cv_func_b64_ntop" = xyes +then : + printf "%s\n" "#define HAVE_B64_NTOP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "__b64_ntop" "ac_cv_func___b64_ntop" +if test "x$ac_cv_func___b64_ntop" = xyes +then : + printf "%s\n" "#define HAVE___B64_NTOP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "b64_pton" "ac_cv_func_b64_pton" +if test "x$ac_cv_func_b64_pton" = xyes +then : + printf "%s\n" "#define HAVE_B64_PTON 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "__b64_pton" "ac_cv_func___b64_pton" +if test "x$ac_cv_func___b64_pton" = xyes +then : + printf "%s\n" "#define HAVE___B64_PTON 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "bcopy" "ac_cv_func_bcopy" +if test "x$ac_cv_func_bcopy" = xyes +then : + printf "%s\n" "#define HAVE_BCOPY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "bcrypt_pbkdf" "ac_cv_func_bcrypt_pbkdf" +if test "x$ac_cv_func_bcrypt_pbkdf" = xyes +then : + printf "%s\n" "#define HAVE_BCRYPT_PBKDF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "bindresvport_sa" "ac_cv_func_bindresvport_sa" +if test "x$ac_cv_func_bindresvport_sa" = xyes +then : + printf "%s\n" "#define HAVE_BINDRESVPORT_SA 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "blf_enc" "ac_cv_func_blf_enc" +if test "x$ac_cv_func_blf_enc" = xyes +then : + printf "%s\n" "#define HAVE_BLF_ENC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "bzero" "ac_cv_func_bzero" +if test "x$ac_cv_func_bzero" = xyes +then : + printf "%s\n" "#define HAVE_BZERO 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "cap_rights_limit" "ac_cv_func_cap_rights_limit" +if test "x$ac_cv_func_cap_rights_limit" = xyes +then : + printf "%s\n" "#define HAVE_CAP_RIGHTS_LIMIT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "clock" "ac_cv_func_clock" +if test "x$ac_cv_func_clock" = xyes +then : + printf "%s\n" "#define HAVE_CLOCK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "closefrom" "ac_cv_func_closefrom" +if test "x$ac_cv_func_closefrom" = xyes +then : + printf "%s\n" "#define HAVE_CLOSEFROM 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "close_range" "ac_cv_func_close_range" +if test "x$ac_cv_func_close_range" = xyes +then : + printf "%s\n" "#define HAVE_CLOSE_RANGE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd" +if test "x$ac_cv_func_dirfd" = xyes +then : + printf "%s\n" "#define HAVE_DIRFD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "endgrent" "ac_cv_func_endgrent" +if test "x$ac_cv_func_endgrent" = xyes +then : + printf "%s\n" "#define HAVE_ENDGRENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "err" "ac_cv_func_err" +if test "x$ac_cv_func_err" = xyes +then : + printf "%s\n" "#define HAVE_ERR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "errx" "ac_cv_func_errx" +if test "x$ac_cv_func_errx" = xyes +then : + printf "%s\n" "#define HAVE_ERRX 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero" +if test "x$ac_cv_func_explicit_bzero" = xyes +then : + printf "%s\n" "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "explicit_memset" "ac_cv_func_explicit_memset" +if test "x$ac_cv_func_explicit_memset" = xyes +then : + printf "%s\n" "#define HAVE_EXPLICIT_MEMSET 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fchmod" "ac_cv_func_fchmod" +if test "x$ac_cv_func_fchmod" = xyes +then : + printf "%s\n" "#define HAVE_FCHMOD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fchmodat" "ac_cv_func_fchmodat" +if test "x$ac_cv_func_fchmodat" = xyes +then : + printf "%s\n" "#define HAVE_FCHMODAT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fchown" "ac_cv_func_fchown" +if test "x$ac_cv_func_fchown" = xyes +then : + printf "%s\n" "#define HAVE_FCHOWN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fchownat" "ac_cv_func_fchownat" +if test "x$ac_cv_func_fchownat" = xyes +then : + printf "%s\n" "#define HAVE_FCHOWNAT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock" +if test "x$ac_cv_func_flock" = xyes +then : + printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fnmatch" "ac_cv_func_fnmatch" +if test "x$ac_cv_func_fnmatch" = xyes +then : + printf "%s\n" "#define HAVE_FNMATCH 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "freeaddrinfo" "ac_cv_func_freeaddrinfo" +if test "x$ac_cv_func_freeaddrinfo" = xyes +then : + printf "%s\n" "#define HAVE_FREEADDRINFO 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "freezero" "ac_cv_func_freezero" +if test "x$ac_cv_func_freezero" = xyes +then : + printf "%s\n" "#define HAVE_FREEZERO 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fstatat" "ac_cv_func_fstatat" +if test "x$ac_cv_func_fstatat" = xyes +then : + printf "%s\n" "#define HAVE_FSTATAT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fstatfs" "ac_cv_func_fstatfs" +if test "x$ac_cv_func_fstatfs" = xyes +then : + printf "%s\n" "#define HAVE_FSTATFS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fstatvfs" "ac_cv_func_fstatvfs" +if test "x$ac_cv_func_fstatvfs" = xyes +then : + printf "%s\n" "#define HAVE_FSTATVFS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "futimes" "ac_cv_func_futimes" +if test "x$ac_cv_func_futimes" = xyes +then : + printf "%s\n" "#define HAVE_FUTIMES 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" +if test "x$ac_cv_func_getaddrinfo" = xyes +then : + printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" +if test "x$ac_cv_func_getcwd" = xyes +then : + printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy" +if test "x$ac_cv_func_getentropy" = xyes +then : + printf "%s\n" "#define HAVE_GETENTROPY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist" +if test "x$ac_cv_func_getgrouplist" = xyes +then : + printf "%s\n" "#define HAVE_GETGROUPLIST 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline" +if test "x$ac_cv_func_getline" = xyes +then : + printf "%s\n" "#define HAVE_GETLINE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" +if test "x$ac_cv_func_getnameinfo" = xyes +then : + printf "%s\n" "#define HAVE_GETNAMEINFO 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt" +if test "x$ac_cv_func_getopt" = xyes +then : + printf "%s\n" "#define HAVE_GETOPT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpeereid" "ac_cv_func_getpeereid" +if test "x$ac_cv_func_getpeereid" = xyes +then : + printf "%s\n" "#define HAVE_GETPEEREID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpeerucred" "ac_cv_func_getpeerucred" +if test "x$ac_cv_func_getpeerucred" = xyes +then : + printf "%s\n" "#define HAVE_GETPEERUCRED 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpgid" "ac_cv_func_getpgid" +if test "x$ac_cv_func_getpgid" = xyes +then : + printf "%s\n" "#define HAVE_GETPGID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "_getpty" "ac_cv_func__getpty" +if test "x$ac_cv_func__getpty" = xyes +then : + printf "%s\n" "#define HAVE__GETPTY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit" +if test "x$ac_cv_func_getrlimit" = xyes +then : + printf "%s\n" "#define HAVE_GETRLIMIT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom" +if test "x$ac_cv_func_getrandom" = xyes +then : + printf "%s\n" "#define HAVE_GETRANDOM 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getsid" "ac_cv_func_getsid" +if test "x$ac_cv_func_getsid" = xyes +then : + printf "%s\n" "#define HAVE_GETSID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getttyent" "ac_cv_func_getttyent" +if test "x$ac_cv_func_getttyent" = xyes +then : + printf "%s\n" "#define HAVE_GETTTYENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "group_from_gid" "ac_cv_func_group_from_gid" +if test "x$ac_cv_func_group_from_gid" = xyes +then : + printf "%s\n" "#define HAVE_GROUP_FROM_GID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" +if test "x$ac_cv_func_inet_aton" = xyes +then : + printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa" +if test "x$ac_cv_func_inet_ntoa" = xyes +then : + printf "%s\n" "#define HAVE_INET_NTOA 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" +if test "x$ac_cv_func_inet_ntop" = xyes +then : + printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "innetgr" "ac_cv_func_innetgr" +if test "x$ac_cv_func_innetgr" = xyes +then : + printf "%s\n" "#define HAVE_INNETGR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "killpg" "ac_cv_func_killpg" +if test "x$ac_cv_func_killpg" = xyes +then : + printf "%s\n" "#define HAVE_KILLPG 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "llabs" "ac_cv_func_llabs" +if test "x$ac_cv_func_llabs" = xyes +then : + printf "%s\n" "#define HAVE_LLABS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" +if test "x$ac_cv_func_localtime_r" = xyes +then : + printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "login_getcapbool" "ac_cv_func_login_getcapbool" +if test "x$ac_cv_func_login_getcapbool" = xyes +then : + printf "%s\n" "#define HAVE_LOGIN_GETCAPBOOL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "login_getpwclass" "ac_cv_func_login_getpwclass" +if test "x$ac_cv_func_login_getpwclass" = xyes +then : + printf "%s\n" "#define HAVE_LOGIN_GETPWCLASS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "memmem" "ac_cv_func_memmem" +if test "x$ac_cv_func_memmem" = xyes +then : + printf "%s\n" "#define HAVE_MEMMEM 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove" +if test "x$ac_cv_func_memmove" = xyes +then : + printf "%s\n" "#define HAVE_MEMMOVE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "memset_s" "ac_cv_func_memset_s" +if test "x$ac_cv_func_memset_s" = xyes +then : + printf "%s\n" "#define HAVE_MEMSET_S 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp" +if test "x$ac_cv_func_mkdtemp" = xyes +then : + printf "%s\n" "#define HAVE_MKDTEMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +if test "x$ac_cv_func_mmap" = xyes +then : + printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "ngetaddrinfo" "ac_cv_func_ngetaddrinfo" +if test "x$ac_cv_func_ngetaddrinfo" = xyes +then : + printf "%s\n" "#define HAVE_NGETADDRINFO 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "nlist" "ac_cv_func_nlist" +if test "x$ac_cv_func_nlist" = xyes +then : + printf "%s\n" "#define HAVE_NLIST 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "nsleep" "ac_cv_func_nsleep" +if test "x$ac_cv_func_nsleep" = xyes +then : + printf "%s\n" "#define HAVE_NSLEEP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "ogetaddrinfo" "ac_cv_func_ogetaddrinfo" +if test "x$ac_cv_func_ogetaddrinfo" = xyes +then : + printf "%s\n" "#define HAVE_OGETADDRINFO 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "openlog_r" "ac_cv_func_openlog_r" +if test "x$ac_cv_func_openlog_r" = xyes +then : + printf "%s\n" "#define HAVE_OPENLOG_R 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pledge" "ac_cv_func_pledge" +if test "x$ac_cv_func_pledge" = xyes +then : + printf "%s\n" "#define HAVE_PLEDGE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" +if test "x$ac_cv_func_poll" = xyes +then : + printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "ppoll" "ac_cv_func_ppoll" +if test "x$ac_cv_func_ppoll" = xyes +then : + printf "%s\n" "#define HAVE_PPOLL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl" +if test "x$ac_cv_func_prctl" = xyes +then : + printf "%s\n" "#define HAVE_PRCTL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "procctl" "ac_cv_func_procctl" +if test "x$ac_cv_func_procctl" = xyes +then : + printf "%s\n" "#define HAVE_PROCCTL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pselect" "ac_cv_func_pselect" +if test "x$ac_cv_func_pselect" = xyes +then : + printf "%s\n" "#define HAVE_PSELECT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pstat" "ac_cv_func_pstat" +if test "x$ac_cv_func_pstat" = xyes +then : + printf "%s\n" "#define HAVE_PSTAT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise" +if test "x$ac_cv_func_raise" = xyes +then : + printf "%s\n" "#define HAVE_RAISE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "readpassphrase" "ac_cv_func_readpassphrase" +if test "x$ac_cv_func_readpassphrase" = xyes +then : + printf "%s\n" "#define HAVE_READPASSPHRASE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" +if test "x$ac_cv_func_reallocarray" = xyes +then : + printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "realpath" "ac_cv_func_realpath" +if test "x$ac_cv_func_realpath" = xyes +then : + printf "%s\n" "#define HAVE_REALPATH 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "recvmsg" "ac_cv_func_recvmsg" +if test "x$ac_cv_func_recvmsg" = xyes +then : + printf "%s\n" "#define HAVE_RECVMSG 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "recallocarray" "ac_cv_func_recallocarray" +if test "x$ac_cv_func_recallocarray" = xyes +then : + printf "%s\n" "#define HAVE_RECALLOCARRAY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "rresvport_af" "ac_cv_func_rresvport_af" +if test "x$ac_cv_func_rresvport_af" = xyes +then : + printf "%s\n" "#define HAVE_RRESVPORT_AF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sendmsg" "ac_cv_func_sendmsg" +if test "x$ac_cv_func_sendmsg" = xyes +then : + printf "%s\n" "#define HAVE_SENDMSG 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize" +if test "x$ac_cv_func_setdtablesize" = xyes +then : + printf "%s\n" "#define HAVE_SETDTABLESIZE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setegid" "ac_cv_func_setegid" +if test "x$ac_cv_func_setegid" = xyes +then : + printf "%s\n" "#define HAVE_SETEGID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv" +if test "x$ac_cv_func_setenv" = xyes +then : + printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid" +if test "x$ac_cv_func_seteuid" = xyes +then : + printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setgroupent" "ac_cv_func_setgroupent" +if test "x$ac_cv_func_setgroupent" = xyes +then : + printf "%s\n" "#define HAVE_SETGROUPENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setgroups" "ac_cv_func_setgroups" +if test "x$ac_cv_func_setgroups" = xyes +then : + printf "%s\n" "#define HAVE_SETGROUPS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setlinebuf" "ac_cv_func_setlinebuf" +if test "x$ac_cv_func_setlinebuf" = xyes +then : + printf "%s\n" "#define HAVE_SETLINEBUF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setlogin" "ac_cv_func_setlogin" +if test "x$ac_cv_func_setlogin" = xyes +then : + printf "%s\n" "#define HAVE_SETLOGIN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setpassent" "ac_cv_func_setpassent" +if test "x$ac_cv_func_setpassent" = xyes +then : + printf "%s\n" "#define HAVE_SETPASSENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setpcred" "ac_cv_func_setpcred" +if test "x$ac_cv_func_setpcred" = xyes +then : + printf "%s\n" "#define HAVE_SETPCRED 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle" +if test "x$ac_cv_func_setproctitle" = xyes +then : + printf "%s\n" "#define HAVE_SETPROCTITLE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setregid" "ac_cv_func_setregid" +if test "x$ac_cv_func_setregid" = xyes +then : + printf "%s\n" "#define HAVE_SETREGID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setreuid" "ac_cv_func_setreuid" +if test "x$ac_cv_func_setreuid" = xyes +then : + printf "%s\n" "#define HAVE_SETREUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit" +if test "x$ac_cv_func_setrlimit" = xyes +then : + printf "%s\n" "#define HAVE_SETRLIMIT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid" +if test "x$ac_cv_func_setsid" = xyes +then : + printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setvbuf" "ac_cv_func_setvbuf" +if test "x$ac_cv_func_setvbuf" = xyes +then : + printf "%s\n" "#define HAVE_SETVBUF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" +if test "x$ac_cv_func_sigaction" = xyes +then : + printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigvec" "ac_cv_func_sigvec" +if test "x$ac_cv_func_sigvec" = xyes +then : + printf "%s\n" "#define HAVE_SIGVEC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" +if test "x$ac_cv_func_snprintf" = xyes +then : + printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair" +if test "x$ac_cv_func_socketpair" = xyes +then : + printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "statfs" "ac_cv_func_statfs" +if test "x$ac_cv_func_statfs" = xyes +then : + printf "%s\n" "#define HAVE_STATFS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs" +if test "x$ac_cv_func_statvfs" = xyes +then : + printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr" +if test "x$ac_cv_func_strcasestr" = xyes +then : + printf "%s\n" "#define HAVE_STRCASESTR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup" +if test "x$ac_cv_func_strdup" = xyes +then : + printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" +if test "x$ac_cv_func_strerror" = xyes +then : + printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" +if test "x$ac_cv_func_strlcat" = xyes +then : + printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" +if test "x$ac_cv_func_strlcpy" = xyes +then : + printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strmode" "ac_cv_func_strmode" +if test "x$ac_cv_func_strmode" = xyes +then : + printf "%s\n" "#define HAVE_STRMODE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup" +if test "x$ac_cv_func_strndup" = xyes +then : + printf "%s\n" "#define HAVE_STRNDUP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" +if test "x$ac_cv_func_strnlen" = xyes +then : + printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strnvis" "ac_cv_func_strnvis" +if test "x$ac_cv_func_strnvis" = xyes +then : + printf "%s\n" "#define HAVE_STRNVIS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime" +if test "x$ac_cv_func_strptime" = xyes +then : + printf "%s\n" "#define HAVE_STRPTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strsignal" "ac_cv_func_strsignal" +if test "x$ac_cv_func_strsignal" = xyes +then : + printf "%s\n" "#define HAVE_STRSIGNAL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strtonum" "ac_cv_func_strtonum" +if test "x$ac_cv_func_strtonum" = xyes +then : + printf "%s\n" "#define HAVE_STRTONUM 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll" +if test "x$ac_cv_func_strtoll" = xyes +then : + printf "%s\n" "#define HAVE_STRTOLL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul" +if test "x$ac_cv_func_strtoul" = xyes +then : + printf "%s\n" "#define HAVE_STRTOUL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strtoull" "ac_cv_func_strtoull" +if test "x$ac_cv_func_strtoull" = xyes +then : + printf "%s\n" "#define HAVE_STRTOULL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sysconf" "ac_cv_func_sysconf" +if test "x$ac_cv_func_sysconf" = xyes +then : + printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "tcgetpgrp" "ac_cv_func_tcgetpgrp" +if test "x$ac_cv_func_tcgetpgrp" = xyes +then : + printf "%s\n" "#define HAVE_TCGETPGRP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm" +if test "x$ac_cv_func_timegm" = xyes +then : + printf "%s\n" "#define HAVE_TIMEGM 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "timingsafe_bcmp" "ac_cv_func_timingsafe_bcmp" +if test "x$ac_cv_func_timingsafe_bcmp" = xyes +then : + printf "%s\n" "#define HAVE_TIMINGSAFE_BCMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "truncate" "ac_cv_func_truncate" +if test "x$ac_cv_func_truncate" = xyes +then : + printf "%s\n" "#define HAVE_TRUNCATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "unlinkat" "ac_cv_func_unlinkat" +if test "x$ac_cv_func_unlinkat" = xyes +then : + printf "%s\n" "#define HAVE_UNLINKAT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" +if test "x$ac_cv_func_unsetenv" = xyes +then : + printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "unveil" "ac_cv_func_unveil" +if test "x$ac_cv_func_unveil" = xyes +then : + printf "%s\n" "#define HAVE_UNVEIL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "updwtmpx" "ac_cv_func_updwtmpx" +if test "x$ac_cv_func_updwtmpx" = xyes +then : + printf "%s\n" "#define HAVE_UPDWTMPX 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "utimensat" "ac_cv_func_utimensat" +if test "x$ac_cv_func_utimensat" = xyes +then : + printf "%s\n" "#define HAVE_UTIMENSAT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "user_from_uid" "ac_cv_func_user_from_uid" +if test "x$ac_cv_func_user_from_uid" = xyes +then : + printf "%s\n" "#define HAVE_USER_FROM_UID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep" +if test "x$ac_cv_func_usleep" = xyes +then : + printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf" +if test "x$ac_cv_func_vasprintf" = xyes +then : + printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" +if test "x$ac_cv_func_vsnprintf" = xyes +then : + printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid" +if test "x$ac_cv_func_waitpid" = xyes +then : + printf "%s\n" "#define HAVE_WAITPID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "warn" "ac_cv_func_warn" +if test "x$ac_cv_func_warn" = xyes +then : + printf "%s\n" "#define HAVE_WARN 1" >>confdefs.h + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiler supports __builtin_popcount" >&5 +printf %s "checking whether compiler supports __builtin_popcount... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main (void) +{ + int x = 123, y; + y = __builtin_popcount(123); + exit(y == 6 ? 0 : -1); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define MISSING_BUILTIN_POPCOUNT 1" >>confdefs.h + + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +ac_fn_check_decl "$LINENO" "bzero" "ac_cv_have_decl_bzero" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_bzero" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_BZERO $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "memmem" "ac_cv_have_decl_memmem" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_memmem" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_MEMMEM $ac_have_decl" >>confdefs.h + + +ac_fn_c_check_func "$LINENO" "mblen" "ac_cv_func_mblen" +if test "x$ac_cv_func_mblen" = xyes +then : + printf "%s\n" "#define HAVE_MBLEN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mbtowc" "ac_cv_func_mbtowc" +if test "x$ac_cv_func_mbtowc" = xyes +then : + printf "%s\n" "#define HAVE_MBTOWC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" +if test "x$ac_cv_func_nl_langinfo" = xyes +then : + printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "wcwidth" "ac_cv_func_wcwidth" +if test "x$ac_cv_func_wcwidth" = xyes +then : + printf "%s\n" "#define HAVE_WCWIDTH 1" >>confdefs.h + +fi + + +TEST_SSH_UTF8=${TEST_SSH_UTF8:=yes} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utf8 locale support" >&5 +printf %s "checking for utf8 locale support... " >&6; } +if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming yes" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + + char *loc = setlocale(LC_CTYPE, "en_US.UTF-8"); + if (loc != NULL) + exit(0); + exit(1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + TEST_SSH_UTF8=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + return (isblank('a')); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +printf "%s\n" "#define HAVE_ISBLANK 1" >>confdefs.h + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +disable_pkcs11= +# Check whether --enable-pkcs11 was given. +if test ${enable_pkcs11+y} +then : + enableval=$enable_pkcs11; + if test "x$enableval" = "xno" ; then + disable_pkcs11=1 + fi + + +fi + + +disable_sk= +# Check whether --enable-security-key was given. +if test ${enable_security_key+y} +then : + enableval=$enable_security_key; + if test "x$enableval" = "xno" ; then + disable_sk=1 + fi + + +fi + +enable_sk_internal= + +# Check whether --with-security-key-builtin was given. +if test ${with_security_key_builtin+y} +then : + withval=$with_security_key_builtin; enable_sk_internal=$withval + +fi + + +enable_sk_standalone= + +# Check whether --with-security-key-standalone was given. +if test ${with_security_key_standalone+y} +then : + withval=$with_security_key_standalone; enable_sk_standalone=$withval + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +printf %s "checking for library containing dlopen... " >&6; } +if test ${ac_cv_search_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main (void) +{ +return dlopen (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dl +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_dlopen=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_dlopen+y} +then : + break +fi +done +if test ${ac_cv_search_dlopen+y} +then : + +else $as_nop + ac_cv_search_dlopen=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +printf "%s\n" "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes +then : + printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h + +fi + +ac_fn_check_decl "$LINENO" "RTLD_NOW" "ac_cv_have_decl_RTLD_NOW" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_RTLD_NOW" = xyes +then : + +fi + +# IRIX has a const char return value for gai_strerror() + + for ac_func in gai_strerror +do : + ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror" +if test "x$ac_cv_func_gai_strerror" = xyes +then : + printf "%s\n" "#define HAVE_GAI_STRERROR 1" >>confdefs.h + + printf "%s\n" "#define HAVE_GAI_STRERROR 1" >>confdefs.h + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +const char *gai_strerror(int); + +int +main (void) +{ + + char *str; + str = gai_strerror(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + +printf "%s\n" "#define HAVE_CONST_GAI_STRERROR_PROTO 1" >>confdefs.h + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +done + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5 +printf %s "checking for library containing nanosleep... " >&6; } +if test ${ac_cv_search_nanosleep+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char nanosleep (); +int +main (void) +{ +return nanosleep (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt posix4 +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_nanosleep=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_nanosleep+y} +then : + break +fi +done +if test ${ac_cv_search_nanosleep+y} +then : + +else $as_nop + ac_cv_search_nanosleep=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5 +printf "%s\n" "$ac_cv_search_nanosleep" >&6; } +ac_res=$ac_cv_search_nanosleep +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +printf %s "checking for library containing clock_gettime... " >&6; } +if test ${ac_cv_search_clock_gettime+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char clock_gettime (); +int +main (void) +{ +return clock_gettime (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_clock_gettime=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_clock_gettime+y} +then : + break +fi +done +if test ${ac_cv_search_clock_gettime+y} +then : + +else $as_nop + ac_cv_search_clock_gettime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +printf "%s\n" "$ac_cv_search_clock_gettime" >&6; } +ac_res=$ac_cv_search_clock_gettime +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + +fi + + +ac_fn_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" " #include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_localtime_r" = xyes +then : + +else $as_nop + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_REENTRANT" + unset ac_cv_have_decl_localtime_r + ac_fn_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" " #include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_localtime_r" = xyes +then : + +else $as_nop + CPPFLAGS="$saved_CPPFLAGS" +fi + +fi + +ac_fn_check_decl "$LINENO" "strsep" "ac_cv_have_decl_strsep" " +#ifdef HAVE_STRING_H +# include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_strsep" = xyes +then : + ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep" +if test "x$ac_cv_func_strsep" = xyes +then : + printf "%s\n" "#define HAVE_STRSEP 1" >>confdefs.h + +fi + +fi + +ac_fn_check_decl "$LINENO" "tcsendbreak" "ac_cv_have_decl_tcsendbreak" "#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_tcsendbreak" = xyes +then : + printf "%s\n" "#define HAVE_TCSENDBREAK 1" >>confdefs.h + +else $as_nop + ac_fn_c_check_func "$LINENO" "tcsendbreak" "ac_cv_func_tcsendbreak" +if test "x$ac_cv_func_tcsendbreak" = xyes +then : + printf "%s\n" "#define HAVE_TCSENDBREAK 1" >>confdefs.h + +fi + +fi + +ac_fn_check_decl "$LINENO" "h_errno" "ac_cv_have_decl_h_errno" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_h_errno" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_H_ERRNO $ac_have_decl" >>confdefs.h + + +ac_fn_check_decl "$LINENO" "SHUT_RD" "ac_cv_have_decl_SHUT_RD" " +#include +#include +#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_SHUT_RD" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_SHUT_RD $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "getpeereid" "ac_cv_have_decl_getpeereid" " +#include +#include +#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_getpeereid" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_GETPEEREID $ac_have_decl" >>confdefs.h + + +ac_fn_check_decl "$LINENO" "O_NONBLOCK" "ac_cv_have_decl_O_NONBLOCK" " +#include +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef HAVE_FCNTL_H +# include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_O_NONBLOCK" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_O_NONBLOCK $ac_have_decl" >>confdefs.h + + +ac_fn_check_decl "$LINENO" "ftruncate" "ac_cv_have_decl_ftruncate" " +#include +#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_ftruncate" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_FTRUNCATE $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "getentropy" "ac_cv_have_decl_getentropy" " +#include +#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_getentropy" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_GETENTROPY $ac_have_decl" >>confdefs.h + + +ac_fn_check_decl "$LINENO" "readv" "ac_cv_have_decl_readv" " +#include +#include +#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_readv" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_READV $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "writev" "ac_cv_have_decl_writev" " +#include +#include +#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_writev" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_WRITEV $ac_have_decl" >>confdefs.h + + +ac_fn_check_decl "$LINENO" "MAXSYMLINKS" "ac_cv_have_decl_MAXSYMLINKS" " +#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_MAXSYMLINKS" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_MAXSYMLINKS $ac_have_decl" >>confdefs.h + + +ac_fn_check_decl "$LINENO" "offsetof" "ac_cv_have_decl_offsetof" " +#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_offsetof" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_OFFSETOF $ac_have_decl" >>confdefs.h + + +ac_fn_check_decl "$LINENO" "INFINITY" "ac_cv_have_decl_INFINITY" "#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_INFINITY" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_INFINITY $ac_have_decl" >>confdefs.h +if test $ac_have_decl = 1 +then : + +else $as_nop + ac_fn_check_decl "$LINENO" "__builtin_inff" "ac_cv_have_decl___builtin_inff" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___builtin_inff" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL___BUILTIN_INFF $ac_have_decl" >>confdefs.h + +fi + + +# extra bits for select(2) +ac_fn_check_decl "$LINENO" "howmany" "ac_cv_have_decl_howmany" " +#include +#include +#ifdef HAVE_SYS_SYSMACROS_H +#include +#endif +#ifdef HAVE_SYS_SELECT_H +#include +#endif +#ifdef HAVE_SYS_TIME_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_howmany" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_HOWMANY $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "NFDBITS" "ac_cv_have_decl_NFDBITS" " +#include +#include +#ifdef HAVE_SYS_SYSMACROS_H +#include +#endif +#ifdef HAVE_SYS_SELECT_H +#include +#endif +#ifdef HAVE_SYS_TIME_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_NFDBITS" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_NFDBITS $ac_have_decl" >>confdefs.h + +ac_fn_c_check_type "$LINENO" "fd_mask" "ac_cv_type_fd_mask" " +#include +#include +#ifdef HAVE_SYS_SELECT_H +#include +#endif +#ifdef HAVE_SYS_TIME_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif + +" +if test "x$ac_cv_type_fd_mask" = xyes +then : + +printf "%s\n" "#define HAVE_FD_MASK 1" >>confdefs.h + + +fi + + + + for ac_func in setresuid +do : + ac_fn_c_check_func "$LINENO" "setresuid" "ac_cv_func_setresuid" +if test "x$ac_cv_func_setresuid" = xyes +then : + printf "%s\n" "#define HAVE_SETRESUID 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setresuid seems to work" >&5 +printf %s "checking if setresuid seems to work... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking setresuid" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: not checking setresuid" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main (void) +{ + + errno=0; + setresuid(0,0,0); + if (errno==ENOSYS) + exit(1); + else + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + +printf "%s\n" "#define BROKEN_SETRESUID 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not implemented" >&5 +printf "%s\n" "not implemented" >&6; } +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi + +done + + + for ac_func in setresgid +do : + ac_fn_c_check_func "$LINENO" "setresgid" "ac_cv_func_setresgid" +if test "x$ac_cv_func_setresgid" = xyes +then : + printf "%s\n" "#define HAVE_SETRESGID 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setresgid seems to work" >&5 +printf %s "checking if setresgid seems to work... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking setresuid" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: not checking setresuid" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main (void) +{ + + errno=0; + setresgid(0,0,0); + if (errno==ENOSYS) + exit(1); + else + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + +printf "%s\n" "#define BROKEN_SETRESGID 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not implemented" >&5 +printf "%s\n" "not implemented" >&6; } +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi + +done + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fflush(NULL)" >&5 +printf %s "checking for working fflush(NULL)... " >&6; } +if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming working" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming working" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ +fflush(NULL); exit(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define FFLUSH_NULL_BUG 1" >>confdefs.h + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = xyes +then : + printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "time" "ac_cv_func_time" +if test "x$ac_cv_func_time" = xyes +then : + printf "%s\n" "#define HAVE_TIME 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "endutent" "ac_cv_func_endutent" +if test "x$ac_cv_func_endutent" = xyes +then : + printf "%s\n" "#define HAVE_ENDUTENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getutent" "ac_cv_func_getutent" +if test "x$ac_cv_func_getutent" = xyes +then : + printf "%s\n" "#define HAVE_GETUTENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getutid" "ac_cv_func_getutid" +if test "x$ac_cv_func_getutid" = xyes +then : + printf "%s\n" "#define HAVE_GETUTID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getutline" "ac_cv_func_getutline" +if test "x$ac_cv_func_getutline" = xyes +then : + printf "%s\n" "#define HAVE_GETUTLINE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pututline" "ac_cv_func_pututline" +if test "x$ac_cv_func_pututline" = xyes +then : + printf "%s\n" "#define HAVE_PUTUTLINE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setutent" "ac_cv_func_setutent" +if test "x$ac_cv_func_setutent" = xyes +then : + printf "%s\n" "#define HAVE_SETUTENT 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "utmpname" "ac_cv_func_utmpname" +if test "x$ac_cv_func_utmpname" = xyes +then : + printf "%s\n" "#define HAVE_UTMPNAME 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "endutxent" "ac_cv_func_endutxent" +if test "x$ac_cv_func_endutxent" = xyes +then : + printf "%s\n" "#define HAVE_ENDUTXENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getutxent" "ac_cv_func_getutxent" +if test "x$ac_cv_func_getutxent" = xyes +then : + printf "%s\n" "#define HAVE_GETUTXENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getutxid" "ac_cv_func_getutxid" +if test "x$ac_cv_func_getutxid" = xyes +then : + printf "%s\n" "#define HAVE_GETUTXID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getutxline" "ac_cv_func_getutxline" +if test "x$ac_cv_func_getutxline" = xyes +then : + printf "%s\n" "#define HAVE_GETUTXLINE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getutxuser" "ac_cv_func_getutxuser" +if test "x$ac_cv_func_getutxuser" = xyes +then : + printf "%s\n" "#define HAVE_GETUTXUSER 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pututxline" "ac_cv_func_pututxline" +if test "x$ac_cv_func_pututxline" = xyes +then : + printf "%s\n" "#define HAVE_PUTUTXLINE 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "setutxdb" "ac_cv_func_setutxdb" +if test "x$ac_cv_func_setutxdb" = xyes +then : + printf "%s\n" "#define HAVE_SETUTXDB 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setutxent" "ac_cv_func_setutxent" +if test "x$ac_cv_func_setutxent" = xyes +then : + printf "%s\n" "#define HAVE_SETUTXENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "utmpxname" "ac_cv_func_utmpxname" +if test "x$ac_cv_func_utmpxname" = xyes +then : + printf "%s\n" "#define HAVE_UTMPXNAME 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "getlastlogxbyname" "ac_cv_func_getlastlogxbyname" +if test "x$ac_cv_func_getlastlogxbyname" = xyes +then : + printf "%s\n" "#define HAVE_GETLASTLOGXBYNAME 1" >>confdefs.h + +fi + + +ac_fn_c_check_func "$LINENO" "daemon" "ac_cv_func_daemon" +if test "x$ac_cv_func_daemon" = xyes +then : + +printf "%s\n" "#define HAVE_DAEMON 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for daemon in -lbsd" >&5 +printf %s "checking for daemon in -lbsd... " >&6; } +if test ${ac_cv_lib_bsd_daemon+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char daemon (); +int +main (void) +{ +return daemon (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_bsd_daemon=yes +else $as_nop + ac_cv_lib_bsd_daemon=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_daemon" >&5 +printf "%s\n" "$ac_cv_lib_bsd_daemon" >&6; } +if test "x$ac_cv_lib_bsd_daemon" = xyes +then : + LIBS="$LIBS -lbsd"; printf "%s\n" "#define HAVE_DAEMON 1" >>confdefs.h + +fi + + +fi + + +ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" +if test "x$ac_cv_func_getpagesize" = xyes +then : + +printf "%s\n" "#define HAVE_GETPAGESIZE 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getpagesize in -lucb" >&5 +printf %s "checking for getpagesize in -lucb... " >&6; } +if test ${ac_cv_lib_ucb_getpagesize+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lucb $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char getpagesize (); +int +main (void) +{ +return getpagesize (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_ucb_getpagesize=yes +else $as_nop + ac_cv_lib_ucb_getpagesize=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ucb_getpagesize" >&5 +printf "%s\n" "$ac_cv_lib_ucb_getpagesize" >&6; } +if test "x$ac_cv_lib_ucb_getpagesize" = xyes +then : + LIBS="$LIBS -lucb"; printf "%s\n" "#define HAVE_GETPAGESIZE 1" >>confdefs.h + +fi + + +fi + + +# Check for broken snprintf +if test "x$ac_cv_func_snprintf" = "xyes" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf correctly terminates long strings" >&5 +printf %s "checking whether snprintf correctly terminates long strings... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Assuming working snprintf()" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: Assuming working snprintf()" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + + char b[5]; + snprintf(b,5,"123456789"); + exit(b[4]!='\0'); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define BROKEN_SNPRINTF 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5 +printf "%s\n" "$as_me: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&2;} + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +if test "x$ac_cv_func_snprintf" = "xyes" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf understands %zu" >&5 +printf %s "checking whether snprintf understands %zu... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Assuming working snprintf()" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: Assuming working snprintf()" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include + +int +main (void) +{ + + size_t a = 1, b = 2; + char z[128]; + snprintf(z, sizeof z, "%zu%zu", a, b); + exit(strcmp(z, "12")); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define BROKEN_SNPRINTF 1" >>confdefs.h + + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +# We depend on vsnprintf returning the right thing on overflow: the +# number of characters it tried to create (as per SUSv3) +if test "x$ac_cv_func_vsnprintf" = "xyes" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf returns correct values on overflow" >&5 +printf %s "checking whether vsnprintf returns correct values on overflow... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Assuming working vsnprintf()" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: Assuming working vsnprintf()" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int x_snprintf(char *str, size_t count, const char *fmt, ...) +{ + size_t ret; + va_list ap; + + va_start(ap, fmt); + ret = vsnprintf(str, count, fmt, ap); + va_end(ap); + return ret; +} + +int +main (void) +{ + +char x[1]; +if (x_snprintf(x, 1, "%s %d", "hello", 12345) != 11) + return 1; +if (x_snprintf(NULL, 0, "%s %d", "hello", 12345) != 11) + return 1; +return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define BROKEN_SNPRINTF 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ****** Your vsnprintf() function is broken, complain to your vendor" >&5 +printf "%s\n" "$as_me: WARNING: ****** Your vsnprintf() function is broken, complain to your vendor" >&2;} + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +# On systems where [v]snprintf is broken, but is declared in stdio, +# check that the fmt argument is const char * or just char *. +# This is only useful for when BROKEN_SNPRINTF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf can declare const char *fmt" >&5 +printf %s "checking whether snprintf can declare const char *fmt... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _FORTIFY_SOURCE +#undef _FORTIFY_SOURCE +#endif +#include +int snprintf(char *a, size_t b, const char *c, ...) { return 0; } + +int +main (void) +{ + + snprintf(0, 0, 0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define SNPRINTF_CONST const" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + printf "%s\n" "#define SNPRINTF_CONST /* not const */" >>confdefs.h + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +# Check for missing getpeereid (or equiv) support +NO_PEERCHECK="" +if test "x$ac_cv_func_getpeereid" != "xyes" -a "x$ac_cv_func_getpeerucred" != "xyes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether system supports SO_PEERCRED getsockopt" >&5 +printf %s "checking whether system supports SO_PEERCRED getsockopt... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +int +main (void) +{ +int i = SO_PEERCRED; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAVE_SO_PEERCRED 1" >>confdefs.h + + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + NO_PEERCHECK=1 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +if test ! -z "$check_for_openpty_ctty_bug"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if openpty correctly handles controlling tty" >&5 +printf %s "checking if openpty correctly handles controlling tty... " >&6; } + if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming yes" >&5 +printf "%s\n" "cross-compiling, assuming yes" >&6; } + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#ifdef HAVE_PTY_H +# include +#endif +#include +#include +#include + +int +main (void) +{ + + pid_t pid; + int fd, ptyfd, ttyfd, status; + + pid = fork(); + if (pid < 0) { /* failed */ + exit(1); + } else if (pid > 0) { /* parent */ + waitpid(pid, &status, 0); + if (WIFEXITED(status)) + exit(WEXITSTATUS(status)); + else + exit(2); + } else { /* child */ + close(0); close(1); close(2); + setsid(); + openpty(&ptyfd, &ttyfd, NULL, NULL, NULL); + fd = open("/dev/tty", O_RDWR | O_NOCTTY); + if (fd >= 0) + exit(3); /* Acquired ctty: broken */ + else + exit(0); /* Did not acquire ctty: OK */ + } + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + printf "%s\n" "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h + + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +if test "x$ac_cv_func_getaddrinfo" = "xyes" && \ + test "x$check_for_hpux_broken_getaddrinfo" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo seems to work" >&5 +printf %s "checking if getaddrinfo seems to work... " >&6; } + if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming yes" >&5 +printf "%s\n" "cross-compiling, assuming yes" >&6; } + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +#include + +#define TEST_PORT "2222" + +int +main (void) +{ + + int err, sock; + struct addrinfo *gai_ai, *ai, hints; + char ntop[NI_MAXHOST], strport[NI_MAXSERV], *name = NULL; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_PASSIVE; + + err = getaddrinfo(name, TEST_PORT, &hints, &gai_ai); + if (err != 0) { + fprintf(stderr, "getaddrinfo failed (%s)", gai_strerror(err)); + exit(1); + } + + for (ai = gai_ai; ai != NULL; ai = ai->ai_next) { + if (ai->ai_family != AF_INET6) + continue; + + err = getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop, + sizeof(ntop), strport, sizeof(strport), + NI_NUMERICHOST|NI_NUMERICSERV); + + if (err != 0) { + if (err == EAI_SYSTEM) + perror("getnameinfo EAI_SYSTEM"); + else + fprintf(stderr, "getnameinfo failed: %s\n", + gai_strerror(err)); + exit(2); + } + + sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (sock < 0) + perror("socket"); + if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { + if (errno == EBADF) + exit(3); + } + } + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + printf "%s\n" "#define BROKEN_GETADDRINFO 1" >>confdefs.h + + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +if test "x$ac_cv_func_getaddrinfo" = "xyes" && \ + test "x$check_for_aix_broken_getaddrinfo" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo seems to work" >&5 +printf %s "checking if getaddrinfo seems to work... " >&6; } + if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming no" >&5 +printf "%s\n" "cross-compiling, assuming no" >&6; } + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +#include + +#define TEST_PORT "2222" + +int +main (void) +{ + + int err, sock; + struct addrinfo *gai_ai, *ai, hints; + char ntop[NI_MAXHOST], strport[NI_MAXSERV], *name = NULL; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_PASSIVE; + + err = getaddrinfo(name, TEST_PORT, &hints, &gai_ai); + if (err != 0) { + fprintf(stderr, "getaddrinfo failed (%s)", gai_strerror(err)); + exit(1); + } + + for (ai = gai_ai; ai != NULL; ai = ai->ai_next) { + if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) + continue; + + err = getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop, + sizeof(ntop), strport, sizeof(strport), + NI_NUMERICHOST|NI_NUMERICSERV); + + if (ai->ai_family == AF_INET && err != 0) { + perror("getnameinfo"); + exit(2); + } + } + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define AIX_GETNAMEINFO_HACK 1" >>confdefs.h + + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + printf "%s\n" "#define BROKEN_GETADDRINFO 1" >>confdefs.h + + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +if test "x$ac_cv_func_getaddrinfo" = "xyes"; then + ac_fn_check_decl "$LINENO" "AI_NUMERICSERV" "ac_cv_have_decl_AI_NUMERICSERV" "#include + #include + #include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_AI_NUMERICSERV" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_AI_NUMERICSERV $ac_have_decl" >>confdefs.h + +fi + +if test "x$check_for_conflicting_getspnam" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for conflicting getspnam in shadow.h" >&5 +printf %s "checking for conflicting getspnam in shadow.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + exit(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define GETSPNAM_CONFLICTING_DEFS 1" >>confdefs.h + + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +if test "x$ac_cv_func_strnvis" = "xyes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strnvis" >&5 +printf %s "checking for working strnvis... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming broken" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming broken" >&2;} + +printf "%s\n" "#define BROKEN_STRNVIS 1" >>confdefs.h + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +static void sighandler(int sig) { _exit(1); } + +int +main (void) +{ + + char dst[16]; + + signal(SIGSEGV, sighandler); + if (strnvis(dst, "src", 4, 0) && strcmp(dst, "src") == 0) + exit(0); + exit(1) + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define BROKEN_STRNVIS 1" >>confdefs.h + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if SA_RESTARTed signals interrupt select()" >&5 +printf %s "checking if SA_RESTARTed signals interrupt select()... " >&6; } +if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming yes" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef HAVE_SYS_SELECT +# include +#endif +#include +#include +#include +#include +#include +static void sighandler(int sig) { } + +int +main (void) +{ + + int r; + pid_t pid; + struct sigaction sa; + + sa.sa_handler = sighandler; + sa.sa_flags = SA_RESTART; + (void)sigaction(SIGTERM, &sa, NULL); + if ((pid = fork()) == 0) { /* child */ + pid = getppid(); + sleep(1); + kill(pid, SIGTERM); + sleep(1); + if (getppid() == pid) /* if parent did not exit, shoot it */ + kill(pid, SIGKILL); + exit(0); + } else { /* parent */ + r = select(0, NULL, NULL, NULL, NULL); + } + exit(r == -1 ? 0 : 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define NO_SA_RESTART 1" >>confdefs.h + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + + for ac_func in getpgrp +do : + ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp" +if test "x$ac_cv_func_getpgrp" = xyes +then : + printf "%s\n" "#define HAVE_GETPGRP 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getpgrp accepts zero args" >&5 +printf %s "checking if getpgrp accepts zero args... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main (void) +{ + getpgrp(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define GETPGRP_VOID 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define GETPGRP_VOID 0" >>confdefs.h + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi + +done + +# Search for OpenSSL +saved_CPPFLAGS="$CPPFLAGS" +saved_LDFLAGS="$LDFLAGS" +openssl_bin_PATH="$PATH" + +# Check whether --with-ssl-dir was given. +if test ${with_ssl_dir+y} +then : + withval=$with_ssl_dir; + if test "x$openssl" = "xno" ; then + as_fn_error $? "cannot use --with-ssl-dir when OpenSSL disabled" "$LINENO" 5 + fi + if test "x$withval" != "xno" ; then + case "$withval" in + # Relative paths + ./*|../*) withval="`pwd`/$withval" + esac + if test -d "$withval/lib"; then + libcrypto_path="${withval}/lib" + elif test -d "$withval/lib64"; then + libcrypto_path="$withval/lib64" + else + # Built but not installed + libcrypto_path="${withval}" + fi + if test -n "${rpath_opt}"; then + LDFLAGS="-L${libcrypto_path} ${rpath_opt}${libcrypto_path} ${LDFLAGS}" + else + LDFLAGS="-L${libcrypto_path} ${LDFLAGS}" + fi + if test -d "$withval/include"; then + CPPFLAGS="-I${withval}/include ${CPPFLAGS}" + else + CPPFLAGS="-I${withval} ${CPPFLAGS}" + fi + if test -x "${withval}/bin/openssl" && \ + "${withval}/bin/openssl" version >/dev/null 2>&1; then + openssl_bin_PATH="${withval}/bin${PATH_SEPARATOR}${PATH}" + elif test -x "${withval}/apps/openssl" && \ + "${withval}/apps/openssl" version >/dev/null 2>&1; then + openssl_bin_PATH="${withval}/apps${PATH_SEPARATOR}${PATH}" + fi + fi + + +fi + +for ac_prog in openssl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_openssl_bin+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $openssl_bin in + [\\/]* | ?:[\\/]*) + ac_cv_path_openssl_bin="$openssl_bin" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $openssl_bin_PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_openssl_bin="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +openssl_bin=$ac_cv_path_openssl_bin +if test -n "$openssl_bin"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $openssl_bin" >&5 +printf "%s\n" "$openssl_bin" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$openssl_bin" && break +done + +OPENSSL_BIN=${openssl_bin} + + + +# Check whether --with-openssl-header-check was given. +if test ${with_openssl_header_check+y} +then : + withval=$with_openssl_header_check; + if test "x$withval" = "xno" ; then + openssl_check_nonfatal=1 + fi + + +fi + + +openssl_engine=no + +# Check whether --with-ssl-engine was given. +if test ${with_ssl_engine+y} +then : + withval=$with_ssl_engine; + if test "x$withval" != "xno" ; then + if test "x$openssl" = "xno" ; then + as_fn_error $? "cannot use --with-ssl-engine when OpenSSL disabled" "$LINENO" 5 + fi + openssl_engine=yes + fi + + +fi + + +nocrypto_saved_LIBS="$LIBS" +if test "x$openssl" = "xyes" ; then + LIBS="-lcrypto $LIBS" + CHANNELLIBS="-lcrypto $CHANNELLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char RAND_add (); +int +main (void) +{ +return RAND_add (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +else $as_nop + + # As of early 2026, BoringSSL libcrypto needs -lstdc++ for + # destructors so try that before giving up. + LIBS="$LIBS -lstdc++" + CHANNELLIBS="$CHANNELLIBS -lstdc++" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char RAND_add (); +int +main (void) +{ +return RAND_add (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + +else $as_nop + + as_fn_error $? "*** working libcrypto not found, check config.log" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + ac_fn_c_check_header_compile "$LINENO" "openssl/opensslv.h" "ac_cv_header_openssl_opensslv_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_opensslv_h" = xyes +then : + +else $as_nop + as_fn_error $? "*** OpenSSL headers missing - please install first or check config.log ***" "$LINENO" 5 +fi + + + # Determine OpenSSL header version + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OpenSSL header version" >&5 +printf %s "checking OpenSSL header version... " >&6; } + if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: not checking" >&2;} + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + #include + #define DATA "conftest.sslincver" + +int +main (void) +{ + + FILE *fd; + int rc; + + fd = fopen(DATA,"w"); + if(fd == NULL) + exit(1); + + if ((rc = fprintf(fd, "%08lx (%s)\n", + (unsigned long)OPENSSL_VERSION_NUMBER, + OPENSSL_VERSION_TEXT)) < 0) + exit(1); + + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + + ssl_header_ver=`cat conftest.sslincver` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ssl_header_ver" >&5 +printf "%s\n" "$ssl_header_ver" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } + as_fn_error $? "OpenSSL version test program failed." "$LINENO" 5 + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + # Determining OpenSSL library version is version dependent. + ac_fn_c_check_func "$LINENO" "OpenSSL_version" "ac_cv_func_OpenSSL_version" +if test "x$ac_cv_func_OpenSSL_version" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_VERSION 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "OpenSSL_version_num" "ac_cv_func_OpenSSL_version_num" +if test "x$ac_cv_func_OpenSSL_version_num" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_VERSION_NUM 1" >>confdefs.h + +fi + + + # Determine OpenSSL library version + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OpenSSL library version" >&5 +printf %s "checking OpenSSL library version... " >&6; } + if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: not checking" >&2;} + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + #include + #include + #define DATA "conftest.ssllibver" + +int +main (void) +{ + + FILE *f; + /* We need these legacy bits to warn for old libcrypto */ + #ifndef OPENSSL_VERSION + # define OPENSSL_VERSION SSLEAY_VERSION + #endif + #ifndef HAVE_OPENSSL_VERSION + # define OpenSSL_version SSLeay_version + #endif + #ifndef HAVE_OPENSSL_VERSION_NUM + # define OpenSSL_version_num SSLeay + #endif + if ((f = fopen(DATA, "w")) == NULL) + exit(1); + if (fprintf(f, "%08lx (%s)", + (unsigned long)OpenSSL_version_num(), + OpenSSL_version(OPENSSL_VERSION)) < 0) + exit(1); +#ifdef LIBRESSL_VERSION_NUMBER + if (fprintf(f, " libressl-%08lx", LIBRESSL_VERSION_NUMBER) < 0) + exit(1); +#endif + if (fputc('\n', f) == EOF || fclose(f) == EOF) + exit(1); + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + + sslver=`cat conftest.ssllibver` + ssl_showver=`echo "$sslver" | sed 's/ libressl-.*//'` + # Check version is supported. + case "$sslver" in + 100*|10100*) # 1.0.x, 1.1.0x + as_fn_error $? "OpenSSL >= 1.1.1 required (have \"$ssl_showver\")" "$LINENO" 5 + ;; + 101*) openssl_impl="openssl" # 1.1.x + ;; + 200*) openssl_impl="libressl" + lver=`echo "$sslver" | sed 's/.*libressl-//'` + case "$lver" in + 2*|300*) # 2.x, 3.0.0 + as_fn_error $? "LibreSSL >= 3.1.0 required (have \"$ssl_showver\")" "$LINENO" 5 + ;; + *) ;; # Assume all other versions are good. + esac + ;; + 30*|40*) openssl_impl="openssl" + # OpenSSL 3 & 4; we use the 1.1x API + # https://openssl.org/policies/general/versioning-policy.html + CPPFLAGS="$CPPFLAGS -DOPENSSL_API_COMPAT=0x10100000L" + ;; + *) + as_fn_error $? "Unknown/unsupported OpenSSL version (\"$ssl_showver\")" "$LINENO" 5 + ;; + esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ssl_showver" >&5 +printf "%s\n" "$ssl_showver" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + as_fn_error $? "OpenSSL library not found." "$LINENO" 5 + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + case "$host" in + x86_64-*) + case "$sslver" in + 3000004*) + as_fn_error $? "OpenSSL 3.0.4 has a potential RCE in its RSA implementation (CVE-2022-2274)" "$LINENO" 5 + ;; + esac + esac + + # Sanity check OpenSSL headers + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL's headers match the library" >&5 +printf %s "checking whether OpenSSL's headers match the library... " >&6; } + if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: not checking" >&2;} + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + #include + +int +main (void) +{ + + exit(OpenSSL_version_num() == OPENSSL_VERSION_NUMBER ? 0 : 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + if test "x$openssl_check_nonfatal" = "x"; then + as_fn_error $? "Your OpenSSL headers do not match your + library. Check config.log for details. + If you are sure your installation is consistent, you can disable the check + by running \"./configure --without-openssl-header-check\". + Also see contrib/findssl.sh for help identifying header/library mismatches. + " "$LINENO" 5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Your OpenSSL headers do not match your + library. Check config.log for details. + Also see contrib/findssl.sh for help identifying header/library mismatches." >&5 +printf "%s\n" "$as_me: WARNING: Your OpenSSL headers do not match your + library. Check config.log for details. + Also see contrib/findssl.sh for help identifying header/library mismatches." >&2;} + fi + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if programs using OpenSSL functions will link" >&5 +printf %s "checking if programs using OpenSSL functions will link... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + LIBS="$LIBS -ldl" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if programs using OpenSSL need -ldl" >&5 +printf %s "checking if programs using OpenSSL need -ldl... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + CHANNELLIBS="$CHANNELLIBS -ldl" + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + ac_fn_check_decl "$LINENO" "OPENSSL_IS_AWSLC" "ac_cv_have_decl_OPENSSL_IS_AWSLC" "#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_OPENSSL_IS_AWSLC" = xyes +then : + openssl_impl="aws-lc" +fi + ac_fn_check_decl "$LINENO" "OPENSSL_IS_BORINGSSL" "ac_cv_have_decl_OPENSSL_IS_BORINGSSL" "#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_OPENSSL_IS_BORINGSSL" = xyes +then : + openssl_impl="boringssl" +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OpenSSL implementation" >&5 +printf %s "checking OpenSSL implementation... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $openssl_impl" >&5 +printf "%s\n" "$openssl_impl" >&6; } + + ac_fn_c_check_func "$LINENO" "BN_is_prime_ex" "ac_cv_func_BN_is_prime_ex" +if test "x$ac_cv_func_BN_is_prime_ex" = xyes +then : + printf "%s\n" "#define HAVE_BN_IS_PRIME_EX 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "DES_crypt" "ac_cv_func_DES_crypt" +if test "x$ac_cv_func_DES_crypt" = xyes +then : + printf "%s\n" "#define HAVE_DES_CRYPT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_DigestSign" "ac_cv_func_EVP_DigestSign" +if test "x$ac_cv_func_EVP_DigestSign" = xyes +then : + printf "%s\n" "#define HAVE_EVP_DIGESTSIGN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_DigestVerify" "ac_cv_func_EVP_DigestVerify" +if test "x$ac_cv_func_EVP_DigestVerify" = xyes +then : + printf "%s\n" "#define HAVE_EVP_DIGESTVERIFY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_DigestFinal_ex" "ac_cv_func_EVP_DigestFinal_ex" +if test "x$ac_cv_func_EVP_DigestFinal_ex" = xyes +then : + printf "%s\n" "#define HAVE_EVP_DIGESTFINAL_EX 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_DigestInit_ex" "ac_cv_func_EVP_DigestInit_ex" +if test "x$ac_cv_func_EVP_DigestInit_ex" = xyes +then : + printf "%s\n" "#define HAVE_EVP_DIGESTINIT_EX 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_MD_CTX_cleanup" "ac_cv_func_EVP_MD_CTX_cleanup" +if test "x$ac_cv_func_EVP_MD_CTX_cleanup" = xyes +then : + printf "%s\n" "#define HAVE_EVP_MD_CTX_CLEANUP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_MD_CTX_copy_ex" "ac_cv_func_EVP_MD_CTX_copy_ex" +if test "x$ac_cv_func_EVP_MD_CTX_copy_ex" = xyes +then : + printf "%s\n" "#define HAVE_EVP_MD_CTX_COPY_EX 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_MD_CTX_init" "ac_cv_func_EVP_MD_CTX_init" +if test "x$ac_cv_func_EVP_MD_CTX_init" = xyes +then : + printf "%s\n" "#define HAVE_EVP_MD_CTX_INIT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "HMAC_CTX_init" "ac_cv_func_HMAC_CTX_init" +if test "x$ac_cv_func_HMAC_CTX_init" = xyes +then : + printf "%s\n" "#define HAVE_HMAC_CTX_INIT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "RSA_generate_key_ex" "ac_cv_func_RSA_generate_key_ex" +if test "x$ac_cv_func_RSA_generate_key_ex" = xyes +then : + printf "%s\n" "#define HAVE_RSA_GENERATE_KEY_EX 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "RSA_get_default_method" "ac_cv_func_RSA_get_default_method" +if test "x$ac_cv_func_RSA_get_default_method" = xyes +then : + printf "%s\n" "#define HAVE_RSA_GET_DEFAULT_METHOD 1" >>confdefs.h + +fi + + + # LibreSSL/OpenSSL API differences + ac_fn_c_check_func "$LINENO" "EC_POINT_get_affine_coordinates" "ac_cv_func_EC_POINT_get_affine_coordinates" +if test "x$ac_cv_func_EC_POINT_get_affine_coordinates" = xyes +then : + printf "%s\n" "#define HAVE_EC_POINT_GET_AFFINE_COORDINATES 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EC_POINT_get_affine_coordinates_GFp" "ac_cv_func_EC_POINT_get_affine_coordinates_GFp" +if test "x$ac_cv_func_EC_POINT_get_affine_coordinates_GFp" = xyes +then : + printf "%s\n" "#define HAVE_EC_POINT_GET_AFFINE_COORDINATES_GFP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EC_POINT_set_affine_coordinates" "ac_cv_func_EC_POINT_set_affine_coordinates" +if test "x$ac_cv_func_EC_POINT_set_affine_coordinates" = xyes +then : + printf "%s\n" "#define HAVE_EC_POINT_SET_AFFINE_COORDINATES 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EC_POINT_set_affine_coordinates_GFp" "ac_cv_func_EC_POINT_set_affine_coordinates_GFp" +if test "x$ac_cv_func_EC_POINT_set_affine_coordinates_GFp" = xyes +then : + printf "%s\n" "#define HAVE_EC_POINT_SET_AFFINE_COORDINATES_GFP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_CIPHER_CTX_iv" "ac_cv_func_EVP_CIPHER_CTX_iv" +if test "x$ac_cv_func_EVP_CIPHER_CTX_iv" = xyes +then : + printf "%s\n" "#define HAVE_EVP_CIPHER_CTX_IV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_CIPHER_CTX_iv_noconst" "ac_cv_func_EVP_CIPHER_CTX_iv_noconst" +if test "x$ac_cv_func_EVP_CIPHER_CTX_iv_noconst" = xyes +then : + printf "%s\n" "#define HAVE_EVP_CIPHER_CTX_IV_NOCONST 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_CIPHER_CTX_get_iv" "ac_cv_func_EVP_CIPHER_CTX_get_iv" +if test "x$ac_cv_func_EVP_CIPHER_CTX_get_iv" = xyes +then : + printf "%s\n" "#define HAVE_EVP_CIPHER_CTX_GET_IV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_CIPHER_CTX_get_updated_iv" "ac_cv_func_EVP_CIPHER_CTX_get_updated_iv" +if test "x$ac_cv_func_EVP_CIPHER_CTX_get_updated_iv" = xyes +then : + printf "%s\n" "#define HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_CIPHER_CTX_set_iv" "ac_cv_func_EVP_CIPHER_CTX_set_iv" +if test "x$ac_cv_func_EVP_CIPHER_CTX_set_iv" = xyes +then : + printf "%s\n" "#define HAVE_EVP_CIPHER_CTX_SET_IV 1" >>confdefs.h + +fi + + + if test "x$openssl_engine" = "xyes" ; then + ac_fn_c_check_header_compile "$LINENO" "openssl/opensslconf.h" "ac_cv_header_openssl_opensslconf_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_opensslconf_h" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_OPENSSLCONF_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "openssl/configuration.h" "ac_cv_header_openssl_configuration_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_configuration_h" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_CONFIGURATION_H 1" >>confdefs.h + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL ENGINE support" >&5 +printf %s "checking for OpenSSL ENGINE support... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #ifdef HAVE_OPENSSL_OPENSSLCONF_H + # include + #endif + #ifdef HAVE_OPENSSL_CONFIGURATION_H + # include + #endif + #include + +int +main (void) +{ + + #ifndef OPENSSL_NO_ENGINE + ENGINE_load_builtin_engines(); + ENGINE_register_all_complete(); + #else + #error "OPENSSL_NO_ENGINE" + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define USE_OPENSSL_ENGINE 1" >>confdefs.h + + +else $as_nop + as_fn_error $? "OpenSSL ENGINE support not found" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if EVP_DigestUpdate returns an int" >&5 +printf %s "checking if EVP_DigestUpdate returns an int... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + +int +main (void) +{ + + if(EVP_DigestUpdate(NULL, NULL,0)) + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define OPENSSL_EVP_DIGESTUPDATE_VOID 1" >>confdefs.h + + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + # Check for various EVP support in OpenSSL + ac_fn_c_check_func "$LINENO" "EVP_sha256" "ac_cv_func_EVP_sha256" +if test "x$ac_cv_func_EVP_sha256" = xyes +then : + printf "%s\n" "#define HAVE_EVP_SHA256 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_sha384" "ac_cv_func_EVP_sha384" +if test "x$ac_cv_func_EVP_sha384" = xyes +then : + printf "%s\n" "#define HAVE_EVP_SHA384 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_sha512" "ac_cv_func_EVP_sha512" +if test "x$ac_cv_func_EVP_sha512" = xyes +then : + printf "%s\n" "#define HAVE_EVP_SHA512 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "EVP_chacha20" "ac_cv_func_EVP_chacha20" +if test "x$ac_cv_func_EVP_chacha20" = xyes +then : + printf "%s\n" "#define HAVE_EVP_CHACHA20 1" >>confdefs.h + +fi + + + # Check complete ECC support in OpenSSL + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has ECC support" >&5 +printf %s "checking whether OpenSSL has ECC support... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + #include + #include + #include + +int +main (void) +{ + + EC_KEY *e = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); + EC_KEY *f = EC_KEY_new_by_curve_name(NID_secp384r1); + EC_KEY *g = EC_KEY_new_by_curve_name(NID_secp521r1); + const EVP_MD *m = EVP_sha256(); /* We need this too */ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + as_fn_error $? "libcrypto does not have required ECC support" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + # Check for EC_KEY_METHOD support for ECDSA PKCS#11 + ac_fn_c_check_func "$LINENO" "EC_KEY_METHOD_new" "ac_cv_func_EC_KEY_METHOD_new" +if test "x$ac_cv_func_EC_KEY_METHOD_new" = xyes +then : + printf "%s\n" "#define HAVE_EC_KEY_METHOD_NEW 1" >>confdefs.h + +fi + + + # Check libcrypto ED25519 support + ac_fn_c_check_func "$LINENO" "EVP_PKEY_get_raw_public_key" "ac_cv_func_EVP_PKEY_get_raw_public_key" +if test "x$ac_cv_func_EVP_PKEY_get_raw_public_key" = xyes +then : + printf "%s\n" "#define HAVE_EVP_PKEY_GET_RAW_PUBLIC_KEY 1" >>confdefs.h + +fi + + ac_fn_c_check_func "$LINENO" "EVP_PKEY_get_raw_private_key" "ac_cv_func_EVP_PKEY_get_raw_private_key" +if test "x$ac_cv_func_EVP_PKEY_get_raw_private_key" = xyes +then : + printf "%s\n" "#define HAVE_EVP_PKEY_GET_RAW_PRIVATE_KEY 1" >>confdefs.h + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has ED25519 support" >&5 +printf %s "checking whether OpenSSL has ED25519 support... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + #ifdef OPENSSL_NO_EC + # error "OpenSSL has no EC support." + #endif + +int +main (void) +{ + + unsigned char buf[64]; + memset(buf, 0, sizeof(buf)); + exit(EVP_PKEY_new_raw_private_key(EVP_PKEY_ED25519, NULL, + buf, sizeof(buf)) == NULL); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define OPENSSL_HAS_ED25519 1" >>confdefs.h + + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + case "$openssl_impl" in + aws-lc|boringssl) + # Brainpool does not work with AWC-LS or BoringSSL. + unsupported_algorithms="$unsupported_algorithms mlkem768brainpoolp256r1-sha256" + ;; + *) + ac_fn_check_decl "$LINENO" "NID_brainpoolP256r1" "ac_cv_have_decl_NID_brainpoolP256r1" "#include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_NID_brainpoolP256r1" = xyes +then : + +printf "%s\n" "#define USE_BRAINPOOLP256R1 1" >>confdefs.h + +fi + ;; + esac + +fi + +# PKCS11/U2F depend on OpenSSL and dlopen(). +enable_pkcs11=yes +enable_sk=yes + +if test "x$openssl_impl" = "xaws-lc"; then + enable_pkcs11="disabled; PKCS#11 not supported with AWS-LC" +fi +if test "x$ac_cv_func_dlopen" != "xyes" ; then + enable_pkcs11="disabled; missing dlopen(3)" + enable_sk="disabled; missing dlopen(3)" +fi +if test "x$ac_cv_have_decl_RTLD_NOW" != "xyes" ; then + enable_pkcs11="disabled; missing RTLD_NOW" + enable_sk="disabled; missing RTLD_NOW" +fi +if test ! -z "$disable_pkcs11" ; then + enable_pkcs11="disabled by user" +fi +if test ! -z "$disable_sk" ; then + enable_sk="disabled by user" +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PKCS11" >&5 +printf %s "checking whether to enable PKCS11... " >&6; } +if test "x$enable_pkcs11" = "xyes" ; then + +printf "%s\n" "#define ENABLE_PKCS11 /**/" >>confdefs.h + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_pkcs11" >&5 +printf "%s\n" "$enable_pkcs11" >&6; } + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable U2F" >&5 +printf %s "checking whether to enable U2F... " >&6; } +if test "x$enable_sk" = "xyes" ; then + +printf "%s\n" "#define ENABLE_SK /**/" >>confdefs.h + + SK_DUMMY_LIBRARY=regress/misc/sk-dummy/sk-dummy.so + +else + # Do not try to build sk-dummy library. + SK_DUMMY_LIBRARY="" + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_sk" >&5 +printf "%s\n" "$enable_sk" >&6; } + +# Now check for built-in security key support. +if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" != "xno" ; then + use_pkgconfig_for_libfido2= + if test "x$PKGCONFIG" != "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $PKGCONFIG knows about libfido2" >&5 +printf %s "checking if $PKGCONFIG knows about libfido2... " >&6; } + if "$PKGCONFIG" libfido2; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + use_pkgconfig_for_libfido2=yes + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + fi + if test "x$use_pkgconfig_for_libfido2" = "xyes"; then + LIBFIDO2=`$PKGCONFIG --libs libfido2` + CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libfido2`" + else + LIBFIDO2="-lfido2 -lcbor" + fi + OTHERLIBS=`echo $LIBFIDO2 | sed 's/-lfido2//'` + fido2_error= + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fido_init in -lfido2" >&5 +printf %s "checking for fido_init in -lfido2... " >&6; } +if test ${ac_cv_lib_fido2_fido_init+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfido2 $OTHERLIBS + $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char fido_init (); +int +main (void) +{ +return fido_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_fido2_fido_init=yes +else $as_nop + ac_cv_lib_fido2_fido_init=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fido2_fido_init" >&5 +printf "%s\n" "$ac_cv_lib_fido2_fido_init" >&6; } +if test "x$ac_cv_lib_fido2_fido_init" = xyes +then : + +else $as_nop + fido2_error="missing/unusable libfido2" +fi + + ac_fn_c_check_header_compile "$LINENO" "fido.h" "ac_cv_header_fido_h" "$ac_includes_default" +if test "x$ac_cv_header_fido_h" = xyes +then : + +else $as_nop + fido2_error="missing fido.h from libfido2" +fi + + ac_fn_c_check_header_compile "$LINENO" "fido/credman.h" "ac_cv_header_fido_credman_h" " #include + +" +if test "x$ac_cv_header_fido_credman_h" = xyes +then : + +else $as_nop + fido2_error="missing fido/credman.h from libfido2" +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable libfido2 installation" >&5 +printf %s "checking for usable libfido2 installation... " >&6; } + if test ! -z "$fido2_error" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fido2_error" >&5 +printf "%s\n" "$fido2_error" >&6; } + if test "x$enable_sk_internal" = "xyes" ; then + as_fn_error $? "No usable libfido2 library/headers found" "$LINENO" 5 + fi + LIBFIDO2="" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + + +printf "%s\n" "#define ENABLE_SK_INTERNAL /**/" >>confdefs.h + + enable_sk="built-in" + saved_LIBS="$LIBS" + LIBS="$LIBFIDO2 $LIBS" + ac_fn_c_check_func "$LINENO" "fido_assert_set_clientdata" "ac_cv_func_fido_assert_set_clientdata" +if test "x$ac_cv_func_fido_assert_set_clientdata" = xyes +then : + printf "%s\n" "#define HAVE_FIDO_ASSERT_SET_CLIENTDATA 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fido_cred_prot" "ac_cv_func_fido_cred_prot" +if test "x$ac_cv_func_fido_cred_prot" = xyes +then : + printf "%s\n" "#define HAVE_FIDO_CRED_PROT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fido_cred_set_prot" "ac_cv_func_fido_cred_set_prot" +if test "x$ac_cv_func_fido_cred_set_prot" = xyes +then : + printf "%s\n" "#define HAVE_FIDO_CRED_SET_PROT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fido_cred_set_clientdata" "ac_cv_func_fido_cred_set_clientdata" +if test "x$ac_cv_func_fido_cred_set_clientdata" = xyes +then : + printf "%s\n" "#define HAVE_FIDO_CRED_SET_CLIENTDATA 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fido_dev_get_touch_begin" "ac_cv_func_fido_dev_get_touch_begin" +if test "x$ac_cv_func_fido_dev_get_touch_begin" = xyes +then : + printf "%s\n" "#define HAVE_FIDO_DEV_GET_TOUCH_BEGIN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fido_dev_get_touch_status" "ac_cv_func_fido_dev_get_touch_status" +if test "x$ac_cv_func_fido_dev_get_touch_status" = xyes +then : + printf "%s\n" "#define HAVE_FIDO_DEV_GET_TOUCH_STATUS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fido_dev_supports_cred_prot" "ac_cv_func_fido_dev_supports_cred_prot" +if test "x$ac_cv_func_fido_dev_supports_cred_prot" = xyes +then : + printf "%s\n" "#define HAVE_FIDO_DEV_SUPPORTS_CRED_PROT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fido_dev_is_winhello" "ac_cv_func_fido_dev_is_winhello" +if test "x$ac_cv_func_fido_dev_is_winhello" = xyes +then : + printf "%s\n" "#define HAVE_FIDO_DEV_IS_WINHELLO 1" >>confdefs.h + +fi + + LIBS="$saved_LIBS" + fi +fi + +# Check for standalone SecurityKeyProvider +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build standalone sk-libfido2" >&5 +printf %s "checking whether to build standalone sk-libfido2... " >&6; } +if test "x$enable_sk_standalone" = "xyes" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + SK_STANDALONE=sk-libfido2$SHLIBEXT + +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + SK_STANDALONE="" + +fi + +ac_fn_c_check_func "$LINENO" "arc4random" "ac_cv_func_arc4random" +if test "x$ac_cv_func_arc4random" = xyes +then : + printf "%s\n" "#define HAVE_ARC4RANDOM 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "arc4random_buf" "ac_cv_func_arc4random_buf" +if test "x$ac_cv_func_arc4random_buf" = xyes +then : + printf "%s\n" "#define HAVE_ARC4RANDOM_BUF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "arc4random_stir" "ac_cv_func_arc4random_stir" +if test "x$ac_cv_func_arc4random_stir" = xyes +then : + printf "%s\n" "#define HAVE_ARC4RANDOM_STIR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "arc4random_uniform" "ac_cv_func_arc4random_uniform" +if test "x$ac_cv_func_arc4random_uniform" = xyes +then : + printf "%s\n" "#define HAVE_ARC4RANDOM_UNIFORM 1" >>confdefs.h + +fi + +### Configure cryptographic random number support + +# Check whether OpenSSL seeds itself +if test "x$openssl" = "xyes" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL's PRNG is internally seeded" >&5 +printf %s "checking whether OpenSSL's PRNG is internally seeded... " >&6; } + if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming yes" >&2;} + # This is safe, since we will fatal() at runtime if + # OpenSSL is not seeded correctly. + OPENSSL_SEEDS_ITSELF=yes + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + +int +main (void) +{ + + exit(RAND_status() == 1 ? 0 : 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + + OPENSSL_SEEDS_ITSELF=yes + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +# PRNGD TCP socket + +# Check whether --with-prngd-port was given. +if test ${with_prngd_port+y} +then : + withval=$with_prngd_port; + case "$withval" in + no) + withval="" + ;; + [0-9]*) + ;; + *) + as_fn_error $? "You must specify a numeric port number for --with-prngd-port" "$LINENO" 5 + ;; + esac + if test ! -z "$withval" ; then + PRNGD_PORT="$withval" + +printf "%s\n" "#define PRNGD_PORT $PRNGD_PORT" >>confdefs.h + + fi + + +fi + + +# PRNGD Unix domain socket + +# Check whether --with-prngd-socket was given. +if test ${with_prngd_socket+y} +then : + withval=$with_prngd_socket; + case "$withval" in + yes) + withval="/var/run/egd-pool" + ;; + no) + withval="" + ;; + /*) + ;; + *) + as_fn_error $? "You must specify an absolute path to the entropy socket" "$LINENO" 5 + ;; + esac + + if test ! -z "$withval" ; then + if test ! -z "$PRNGD_PORT" ; then + as_fn_error $? "You may not specify both a PRNGD/EGD port and socket" "$LINENO" 5 + fi + if test ! -r "$withval" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Entropy socket is not readable" >&5 +printf "%s\n" "$as_me: WARNING: Entropy socket is not readable" >&2;} + fi + PRNGD_SOCKET="$withval" + +printf "%s\n" "#define PRNGD_SOCKET \"$PRNGD_SOCKET\"" >>confdefs.h + + fi + +else $as_nop + + # Check for existing socket only if we don't have a random device already + if test "x$OPENSSL_SEEDS_ITSELF" != "xyes" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PRNGD/EGD socket" >&5 +printf %s "checking for PRNGD/EGD socket... " >&6; } + # Insert other locations here + for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do + if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then + PRNGD_SOCKET="$sock" + printf "%s\n" "#define PRNGD_SOCKET \"$PRNGD_SOCKET\"" >>confdefs.h + + break; + fi + done + if test ! -z "$PRNGD_SOCKET" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PRNGD_SOCKET" >&5 +printf "%s\n" "$PRNGD_SOCKET" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + fi + fi + + +fi + + +# Which randomness source do we use? +if test ! -z "$PRNGD_PORT" ; then + RAND_MSG="PRNGd port $PRNGD_PORT" +elif test ! -z "$PRNGD_SOCKET" ; then + RAND_MSG="PRNGd socket $PRNGD_SOCKET" +elif test ! -z "$OPENSSL_SEEDS_ITSELF" ; then + +printf "%s\n" "#define OPENSSL_PRNG_ONLY 1" >>confdefs.h + + RAND_MSG="OpenSSL internal ONLY" +elif test "x$openssl" = "xno" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSH will use /dev/urandom as a source of random numbers. It will fail if this device is not supported or accessible" >&5 +printf "%s\n" "$as_me: WARNING: OpenSSH will use /dev/urandom as a source of random numbers. It will fail if this device is not supported or accessible" >&2;} +else + as_fn_error $? "OpenSSH has no source of random numbers. Please configure OpenSSL with an entropy source or re-run configure using one of the --with-prngd-port or --with-prngd-socket options" "$LINENO" 5 +fi +LIBS="$nocrypto_saved_LIBS" + +saved_LIBS="$LIBS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ia_openinfo in -liaf" >&5 +printf %s "checking for ia_openinfo in -liaf... " >&6; } +if test ${ac_cv_lib_iaf_ia_openinfo+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-liaf $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char ia_openinfo (); +int +main (void) +{ +return ia_openinfo (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_iaf_ia_openinfo=yes +else $as_nop + ac_cv_lib_iaf_ia_openinfo=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iaf_ia_openinfo" >&5 +printf "%s\n" "$ac_cv_lib_iaf_ia_openinfo" >&6; } +if test "x$ac_cv_lib_iaf_ia_openinfo" = xyes +then : + + LIBS="$LIBS -liaf" + + for ac_func in set_id +do : + ac_fn_c_check_func "$LINENO" "set_id" "ac_cv_func_set_id" +if test "x$ac_cv_func_set_id" = xyes +then : + printf "%s\n" "#define HAVE_SET_ID 1" >>confdefs.h + SSHDLIBS="$SSHDLIBS -liaf" + +printf "%s\n" "#define HAVE_LIBIAF 1" >>confdefs.h + + +fi + +done + +fi + +LIBS="$saved_LIBS" + +# Check for crypt() in libcrypt. If we have it, we only need it for sshd. +saved_LIBS="$LIBS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 +printf %s "checking for crypt in -lcrypt... " >&6; } +if test ${ac_cv_lib_crypt_crypt+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char crypt (); +int +main (void) +{ +return crypt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_crypt_crypt=yes +else $as_nop + ac_cv_lib_crypt_crypt=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 +printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; } +if test "x$ac_cv_lib_crypt_crypt" = xyes +then : + + LIBS="-lcrypt $LIBS" + SSHDLIBS="-lcrypt $SSHDLIBS" + +fi + +ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt" +if test "x$ac_cv_func_crypt" = xyes +then : + printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h + +fi + +LIBS="$saved_LIBS" + +# Check for PAM libs +PAM_MSG="no" + +# Check whether --with-pam was given. +if test ${with_pam+y} +then : + withval=$with_pam; + if test "x$withval" != "xno" ; then + if test "x$ac_cv_header_security_pam_appl_h" != "xyes" && \ + test "x$ac_cv_header_pam_pam_appl_h" != "xyes" ; then + as_fn_error $? "PAM headers not found" "$LINENO" 5 + fi + + saved_LIBS="$LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main (void) +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_dl_dlopen=yes +else $as_nop + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : + printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h + + LIBS="-ldl $LIBS" + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pam_set_item in -lpam" >&5 +printf %s "checking for pam_set_item in -lpam... " >&6; } +if test ${ac_cv_lib_pam_pam_set_item+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpam $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char pam_set_item (); +int +main (void) +{ +return pam_set_item (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_pam_pam_set_item=yes +else $as_nop + ac_cv_lib_pam_pam_set_item=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_set_item" >&5 +printf "%s\n" "$ac_cv_lib_pam_pam_set_item" >&6; } +if test "x$ac_cv_lib_pam_pam_set_item" = xyes +then : + printf "%s\n" "#define HAVE_LIBPAM 1" >>confdefs.h + + LIBS="-lpam $LIBS" + +else $as_nop + as_fn_error $? "*** libpam missing" "$LINENO" 5 +fi + + ac_fn_c_check_func "$LINENO" "pam_getenvlist" "ac_cv_func_pam_getenvlist" +if test "x$ac_cv_func_pam_getenvlist" = xyes +then : + printf "%s\n" "#define HAVE_PAM_GETENVLIST 1" >>confdefs.h + +fi + + ac_fn_c_check_func "$LINENO" "pam_putenv" "ac_cv_func_pam_putenv" +if test "x$ac_cv_func_pam_putenv" = xyes +then : + printf "%s\n" "#define HAVE_PAM_PUTENV 1" >>confdefs.h + +fi + + LIBS="$saved_LIBS" + + PAM_MSG="yes" + + SSHDLIBS="$SSHDLIBS -lpam" + +printf "%s\n" "#define USE_PAM 1" >>confdefs.h + + + if test $ac_cv_lib_dl_dlopen = yes; then + case "$LIBS" in + *-ldl*) + # libdl already in LIBS + ;; + *) + SSHDLIBS="$SSHDLIBS -ldl" + ;; + esac + fi + fi + + +fi + + + +# Check whether --with-pam-service was given. +if test ${with_pam_service+y} +then : + withval=$with_pam_service; + if test "x$withval" != "xno" && \ + test "x$withval" != "xyes" ; then + +printf "%s\n" "#define SSHD_PAM_SERVICE \"$withval\"" >>confdefs.h + + fi + + +fi + + +# Check for older PAM +if test "x$PAM_MSG" = "xyes" ; then + # Check PAM strerror arguments (old PAM) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pam_strerror takes only one argument" >&5 +printf %s "checking whether pam_strerror takes only one argument... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if defined(HAVE_SECURITY_PAM_APPL_H) +#include +#elif defined (HAVE_PAM_PAM_APPL_H) +#include +#endif + +int +main (void) +{ + +(void)pam_strerror((pam_handle_t *)NULL, -1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +else $as_nop + + +printf "%s\n" "#define HAVE_OLD_PAM 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + PAM_MSG="yes (old library)" + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +case "$host" in +*-*-cygwin*) + SSH_PRIVSEP_USER=CYGWIN_SSH_PRIVSEP_USER + ;; +*) + SSH_PRIVSEP_USER=sshd + ;; +esac + +# Check whether --with-privsep-user was given. +if test ${with_privsep_user+y} +then : + withval=$with_privsep_user; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + SSH_PRIVSEP_USER=$withval + fi + + +fi + +if test "x$SSH_PRIVSEP_USER" = "xCYGWIN_SSH_PRIVSEP_USER" ; then + +printf "%s\n" "#define SSH_PRIVSEP_USER CYGWIN_SSH_PRIVSEP_USER" >>confdefs.h + +else + +printf "%s\n" "#define SSH_PRIVSEP_USER \"$SSH_PRIVSEP_USER\"" >>confdefs.h + +fi + + +if test "x$have_linux_no_new_privs" = "x1" ; then +ac_fn_check_decl "$LINENO" "SECCOMP_MODE_FILTER" "ac_cv_have_decl_SECCOMP_MODE_FILTER" " + #include + #include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_SECCOMP_MODE_FILTER" = xyes +then : + have_seccomp_filter=1 +fi +fi +if test "x$have_seccomp_filter" = "x1" ; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking kernel for seccomp_filter support" >&5 +printf %s "checking kernel for seccomp_filter support... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + #include + #include + #include + +int +main (void) +{ + int i = $seccomp_audit_arch; + errno = 0; + prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, NULL, 0, 0); + exit(errno == EFAULT ? 0 : 1); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + # Disable seccomp filter as a target + have_seccomp_filter=0 + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +fi + +ac_fn_c_check_member "$LINENO" "struct pollfd" "fd" "ac_cv_member_struct_pollfd_fd" " +#include +#ifdef HAVE_POLL_H +#include +#endif +#ifdef HAVE_SYS_POLL_H +#include +#endif + +" +if test "x$ac_cv_member_struct_pollfd_fd" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_POLLFD_FD 1" >>confdefs.h + + +fi + + +ac_fn_c_check_type "$LINENO" "nfds_t" "ac_cv_type_nfds_t" " +#include +#ifdef HAVE_POLL_H +#include +#endif +#ifdef HAVE_SYS_POLL_H +#include +#endif + +" +if test "x$ac_cv_type_nfds_t" = xyes +then : + +printf "%s\n" "#define HAVE_NFDS_T 1" >>confdefs.h + + +fi + + +if test "x$ac_cv_type_nfds_t" != "xyes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if poll nfds_t is unsigned long" >&5 +printf %s "checking if poll nfds_t is unsigned long... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef HAVE_POLL_H +#include +#endif +#ifdef HAVE_SYS_POLL_H +#include +#endif + int poll(struct pollfd *, unsigned long, int timeout); + +int +main (void) +{ +return poll(0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define POLL_NFDS_T_ULONG 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +# Decide which sandbox style to use +sandbox_arg="" + +# Check whether --with-sandbox was given. +if test ${with_sandbox+y} +then : + withval=$with_sandbox; + if test "x$withval" = "xyes" ; then + sandbox_arg="" + else + sandbox_arg="$withval" + fi + + +fi + + +if test "x$sandbox_arg" != "xno"; then +# POSIX specifies that poll() "shall fail with EINVAL if the nfds argument +# is greater than OPEN_MAX". On some platforms that includes implementions +# of select in userspace on top of poll() so check both work with rlimit +# NOFILES so check that both work before enabling the rlimit sandbox. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if select and/or poll works with descriptor rlimit" >&5 +printf %s "checking if select and/or poll works with descriptor rlimit... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming no" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming no" >&2;} + select_works_with_rlimit=no + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef HAVE_SYS_TIME_H +# include +#endif +#include +#ifdef HAVE_SYS_SELECT_H +# include +#endif +#ifdef HAVE_POLL_H +# include +#elif HAVE_SYS_POLL_H +# include +#endif +#include +#include +#include + +int +main (void) +{ + + struct rlimit rl_zero; + int fd, r; + fd_set fds; + struct timeval tv; +#ifdef HAVE_POLL + struct pollfd pfd; +#endif + + fd = open("/dev/null", O_RDONLY); + FD_ZERO(&fds); + FD_SET(fd, &fds); + rl_zero.rlim_cur = rl_zero.rlim_max = 0; + setrlimit(RLIMIT_FSIZE, &rl_zero); + setrlimit(RLIMIT_NOFILE, &rl_zero); + tv.tv_sec = 1; + tv.tv_usec = 0; + r = select(fd+1, &fds, NULL, NULL, &tv); + if (r == -1) + exit(1); +#ifdef HAVE_POLL + pfd.fd = fd; + pfd.events = POLLIN; + r = poll(&pfd, 1, 1); + if (r == -1) + exit(2); +#endif + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + select_works_with_rlimit=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + select_works_with_rlimit=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setrlimit(RLIMIT_NOFILE,{0,0}) works" >&5 +printf %s "checking if setrlimit(RLIMIT_NOFILE,{0,0}) works... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming yes" >&2;} + rlimit_nofile_zero_works=yes + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef HAVE_SYS_TIME_H +# include +#endif +#include +#include +#include + +int +main (void) +{ + + struct rlimit rl_zero; + int r; + + rl_zero.rlim_cur = rl_zero.rlim_max = 0; + r = setrlimit(RLIMIT_NOFILE, &rl_zero); + exit (r == -1 ? 1 : 0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + rlimit_nofile_zero_works=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + rlimit_nofile_zero_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setrlimit RLIMIT_FSIZE works" >&5 +printf %s "checking if setrlimit RLIMIT_FSIZE works... " >&6; } + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: assuming yes" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main (void) +{ + + struct rlimit rl_zero; + + rl_zero.rlim_cur = rl_zero.rlim_max = 0; + exit(setrlimit(RLIMIT_FSIZE, &rl_zero) != 0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +printf "%s\n" "#define SANDBOX_SKIP_RLIMIT_FSIZE 1" >>confdefs.h + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +if test "x$sandbox_arg" = "xdarwin" || \ + ( test -z "$sandbox_arg" && test "x$ac_cv_func_sandbox_init" = "xyes" && \ + test "x$ac_cv_header_sandbox_h" = "xyes") ; then + test "x$ac_cv_func_sandbox_init" != "xyes" -o \ + "x$ac_cv_header_sandbox_h" != "xyes" && \ + as_fn_error $? "Darwin seatbelt sandbox requires sandbox.h and sandbox_init function" "$LINENO" 5 + SANDBOX_STYLE="darwin" + +printf "%s\n" "#define SANDBOX_DARWIN 1" >>confdefs.h + +elif test "x$sandbox_arg" = "xseccomp_filter" || \ + ( test -z "$sandbox_arg" && \ + test "x$have_seccomp_filter" = "x1" && \ + test "x$ac_cv_header_elf_h" = "xyes" && \ + test "x$ac_cv_header_linux_audit_h" = "xyes" && \ + test "x$ac_cv_header_linux_filter_h" = "xyes" && \ + test "x$seccomp_audit_arch" != "x" && \ + test "x$have_linux_no_new_privs" = "x1" && \ + test "x$ac_cv_func_prctl" = "xyes" ) ; then + test "x$seccomp_audit_arch" = "x" && \ + as_fn_error $? "seccomp_filter sandbox not supported on $host" "$LINENO" 5 + test "x$have_linux_no_new_privs" != "x1" && \ + as_fn_error $? "seccomp_filter sandbox requires PR_SET_NO_NEW_PRIVS" "$LINENO" 5 + test "x$have_seccomp_filter" != "x1" && \ + as_fn_error $? "seccomp_filter sandbox requires seccomp headers" "$LINENO" 5 + test "x$ac_cv_func_prctl" != "xyes" && \ + as_fn_error $? "seccomp_filter sandbox requires prctl function" "$LINENO" 5 + SANDBOX_STYLE="seccomp_filter" + +printf "%s\n" "#define SANDBOX_SECCOMP_FILTER 1" >>confdefs.h + +elif test "x$sandbox_arg" = "xcapsicum" || \ + ( test -z "$sandbox_arg" && \ + test "x$disable_capsicum" != "xyes" && \ + test "x$ac_cv_header_sys_capsicum_h" = "xyes" && \ + test "x$ac_cv_func_cap_rights_limit" = "xyes") ; then + test "x$ac_cv_header_sys_capsicum_h" != "xyes" && \ + as_fn_error $? "capsicum sandbox requires sys/capsicum.h header" "$LINENO" 5 + test "x$ac_cv_func_cap_rights_limit" != "xyes" && \ + as_fn_error $? "capsicum sandbox requires cap_rights_limit function" "$LINENO" 5 + SANDBOX_STYLE="capsicum" + +printf "%s\n" "#define SANDBOX_CAPSICUM 1" >>confdefs.h + +elif test "x$sandbox_arg" = "xrlimit" || \ + ( test -z "$sandbox_arg" && test "x$ac_cv_func_setrlimit" = "xyes" && \ + test "x$select_works_with_rlimit" = "xyes" && \ + test "x$rlimit_nofile_zero_works" = "xyes" ) ; then + test "x$ac_cv_func_setrlimit" != "xyes" && \ + as_fn_error $? "rlimit sandbox requires setrlimit function" "$LINENO" 5 + test "x$select_works_with_rlimit" != "xyes" && \ + as_fn_error $? "rlimit sandbox requires select to work with rlimit" "$LINENO" 5 + SANDBOX_STYLE="rlimit" + +printf "%s\n" "#define SANDBOX_RLIMIT 1" >>confdefs.h + +elif test "x$sandbox_arg" = "xsolaris" || \ + ( test -z "$sandbox_arg" && test "x$SOLARIS_PRIVS" = "xyes" ) ; then + SANDBOX_STYLE="solaris" + +printf "%s\n" "#define SANDBOX_SOLARIS 1" >>confdefs.h + +elif test -z "$sandbox_arg" || test "x$sandbox_arg" = "xno" || \ + test "x$sandbox_arg" = "xnone" || test "x$sandbox_arg" = "xnull" ; then + SANDBOX_STYLE="none" + +printf "%s\n" "#define SANDBOX_NULL 1" >>confdefs.h + +else + as_fn_error $? "unsupported --with-sandbox" "$LINENO" 5 +fi + +# Cheap hack to ensure NEWS-OS libraries are arranged right. +if test ! -z "$SONY" ; then + LIBS="$LIBS -liberty"; +fi + +# Check for long long datatypes +ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default" +if test "x$ac_cv_type_long_long" = xyes +then : + +printf "%s\n" "#define HAVE_LONG_LONG 1" >>confdefs.h + + +fi +ac_fn_c_check_type "$LINENO" "unsigned long long" "ac_cv_type_unsigned_long_long" "$ac_includes_default" +if test "x$ac_cv_type_unsigned_long_long" = xyes +then : + +printf "%s\n" "#define HAVE_UNSIGNED_LONG_LONG 1" >>confdefs.h + + +fi +ac_fn_c_check_type "$LINENO" "long double" "ac_cv_type_long_double" "$ac_includes_default" +if test "x$ac_cv_type_long_double" = xyes +then : + +printf "%s\n" "#define HAVE_LONG_DOUBLE 1" >>confdefs.h + + +fi + + +# Check datatype sizes +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short int" >&5 +printf %s "checking size of short int... " >&6; } +if test ${ac_cv_sizeof_short_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short int))" "ac_cv_sizeof_short_int" "$ac_includes_default" +then : + +else $as_nop + if test "$ac_cv_type_short_int" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (short int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_short_int=0 + fi +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short_int" >&5 +printf "%s\n" "$ac_cv_sizeof_short_int" >&6; } + + + +printf "%s\n" "#define SIZEOF_SHORT_INT $ac_cv_sizeof_short_int" >>confdefs.h + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +printf %s "checking size of int... " >&6; } +if test ${ac_cv_sizeof_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default" +then : + +else $as_nop + if test "$ac_cv_type_int" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +printf "%s\n" "$ac_cv_sizeof_int" >&6; } + + + +printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5 +printf %s "checking size of long int... " >&6; } +if test ${ac_cv_sizeof_long_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int" "$ac_includes_default" +then : + +else $as_nop + if test "$ac_cv_type_long_int" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_int=0 + fi +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_int" >&5 +printf "%s\n" "$ac_cv_sizeof_long_int" >&6; } + + + +printf "%s\n" "#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int" >>confdefs.h + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5 +printf %s "checking size of long long int... " >&6; } +if test ${ac_cv_sizeof_long_long_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int" "$ac_includes_default" +then : + +else $as_nop + if test "$ac_cv_type_long_long_int" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long long int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_long_int=0 + fi +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5 +printf "%s\n" "$ac_cv_sizeof_long_long_int" >&6; } + + + +printf "%s\n" "#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int" >>confdefs.h + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 +printf %s "checking size of time_t... " >&6; } +if test ${ac_cv_sizeof_time_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" " + #include + #ifdef HAVE_SYS_TIME_H + # include + #endif + #ifdef HAVE_TIME_H + # include + #endif + + +" +then : + +else $as_nop + if test "$ac_cv_type_time_t" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (time_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_time_t=0 + fi +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 +printf "%s\n" "$ac_cv_sizeof_time_t" >&6; } + + + +printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h + + + +# Sanity check long long for some platforms (AIX) +if test "x$ac_cv_sizeof_long_long_int" = "x4" ; then + ac_cv_sizeof_long_long_int=0 +fi + +# compute LLONG_MIN and LLONG_MAX if we don't know them. +if test -z "$have_llong_max" && test -z "$have_long_long_max"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for max value of long long" >&5 +printf %s "checking for max value of long long... " >&6; } + if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: not checking" >&2;} + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +/* Why is this so damn hard? */ +#ifdef __GNUC__ +# undef __GNUC__ +#endif +#define __USE_ISOC99 +#include +#define DATA "conftest.llminmax" +#define my_abs(a) ((a) < 0 ? ((a) * -1) : (a)) + +/* + * printf in libc on some platforms (eg old Tru64) does not understand %lld so + * we do this the hard way. + */ +static int +fprint_ll(FILE *f, long long n) +{ + unsigned int i; + int l[sizeof(long long) * 8]; + + if (n < 0) + if (fprintf(f, "-") < 0) + return -1; + for (i = 0; n != 0; i++) { + l[i] = my_abs(n % 10); + n /= 10; + } + do { + if (fprintf(f, "%d", l[--i]) < 0) + return -1; + } while (i != 0); + if (fprintf(f, " ") < 0) + return -1; + return 0; +} + +int +main (void) +{ + + FILE *f; + long long i, llmin, llmax = 0; + + if((f = fopen(DATA,"w")) == NULL) + exit(1); + +#if defined(LLONG_MIN) && defined(LLONG_MAX) + fprintf(stderr, "Using system header for LLONG_MIN and LLONG_MAX\n"); + llmin = LLONG_MIN; + llmax = LLONG_MAX; +#else + fprintf(stderr, "Calculating LLONG_MIN and LLONG_MAX\n"); + /* This will work on one's complement and two's complement */ + for (i = 1; i > llmax; i <<= 1, i++) + llmax = i; + llmin = llmax + 1LL; /* wrap */ +#endif + + /* Sanity check */ + if (llmin + 1 < llmin || llmin - 1 < llmin || llmax + 1 > llmax + || llmax - 1 > llmax || llmin == llmax || llmin == 0 + || llmax == 0 || llmax < LONG_MAX || llmin > LONG_MIN) { + fprintf(f, "unknown unknown\n"); + exit(2); + } + + if (fprint_ll(f, llmin) < 0) + exit(3); + if (fprint_ll(f, llmax) < 0) + exit(4); + if (fclose(f) < 0) + exit(5); + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + + llong_min=`$AWK '{print $1}' conftest.llminmax` + llong_max=`$AWK '{print $2}' conftest.llminmax` + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $llong_max" >&5 +printf "%s\n" "$llong_max" >&6; } + +printf "%s\n" "#define LLONG_MAX ${llong_max}LL" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for min value of long long" >&5 +printf %s "checking for min value of long long... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $llong_min" >&5 +printf "%s\n" "$llong_min" >&6; } + +printf "%s\n" "#define LLONG_MIN ${llong_min}LL" >>confdefs.h + + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +ac_fn_check_decl "$LINENO" "UINT32_MAX" "ac_cv_have_decl_UINT32_MAX" " +#ifdef HAVE_SYS_LIMITS_H +# include +#endif +#ifdef HAVE_LIMITS_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_UINT32_MAX" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_UINT32_MAX $ac_have_decl" >>confdefs.h + + +# More checks for data types +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for u_int type" >&5 +printf %s "checking for u_int type... " >&6; } +if test ${ac_cv_have_u_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + u_int a; a = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_u_int="yes" +else $as_nop + ac_cv_have_u_int="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_u_int" >&5 +printf "%s\n" "$ac_cv_have_u_int" >&6; } +if test "x$ac_cv_have_u_int" = "xyes" ; then + +printf "%s\n" "#define HAVE_U_INT 1" >>confdefs.h + + have_u_int=1 +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intXX_t types" >&5 +printf %s "checking for intXX_t types... " >&6; } +if test ${ac_cv_have_intxx_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + int8_t a; int16_t b; int32_t c; a = b = c = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_intxx_t="yes" +else $as_nop + ac_cv_have_intxx_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_intxx_t" >&5 +printf "%s\n" "$ac_cv_have_intxx_t" >&6; } +if test "x$ac_cv_have_intxx_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_INTXX_T 1" >>confdefs.h + + have_intxx_t=1 +fi + +if (test -z "$have_intxx_t" && \ + test "x$ac_cv_header_stdint_h" = "xyes") +then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intXX_t types in stdint.h" >&5 +printf %s "checking for intXX_t types in stdint.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + int8_t a; int16_t b; int32_t c; a = b = c = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + printf "%s\n" "#define HAVE_INTXX_T 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for int64_t type" >&5 +printf %s "checking for int64_t type... " >&6; } +if test ${ac_cv_have_int64_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef HAVE_STDINT_H +# include +#endif +#include +#ifdef HAVE_SYS_BITYPES_H +# include +#endif + +int +main (void) +{ + +int64_t a; a = 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_int64_t="yes" +else $as_nop + ac_cv_have_int64_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_int64_t" >&5 +printf "%s\n" "$ac_cv_have_int64_t" >&6; } +if test "x$ac_cv_have_int64_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_INT64_T 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for u_intXX_t types" >&5 +printf %s "checking for u_intXX_t types... " >&6; } +if test ${ac_cv_have_u_intxx_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_u_intxx_t="yes" +else $as_nop + ac_cv_have_u_intxx_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_u_intxx_t" >&5 +printf "%s\n" "$ac_cv_have_u_intxx_t" >&6; } +if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_U_INTXX_T 1" >>confdefs.h + + have_u_intxx_t=1 +fi + +if test -z "$have_u_intxx_t" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for u_intXX_t types in sys/socket.h" >&5 +printf %s "checking for u_intXX_t types in sys/socket.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + printf "%s\n" "#define HAVE_U_INTXX_T 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for u_int64_t types" >&5 +printf %s "checking for u_int64_t types... " >&6; } +if test ${ac_cv_have_u_int64_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + u_int64_t a; a = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_u_int64_t="yes" +else $as_nop + ac_cv_have_u_int64_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_u_int64_t" >&5 +printf "%s\n" "$ac_cv_have_u_int64_t" >&6; } +if test "x$ac_cv_have_u_int64_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_U_INT64_T 1" >>confdefs.h + + have_u_int64_t=1 +fi + +if (test -z "$have_u_int64_t" && \ + test "x$ac_cv_header_sys_bitypes_h" = "xyes") +then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for u_int64_t type in sys/bitypes.h" >&5 +printf %s "checking for u_int64_t type in sys/bitypes.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + u_int64_t a; a = 1 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + printf "%s\n" "#define HAVE_U_INT64_T 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +if test -z "$have_u_intxx_t" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uintXX_t types" >&5 +printf %s "checking for uintXX_t types... " >&6; } +if test ${ac_cv_have_uintxx_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include + +int +main (void) +{ + + uint8_t a; + uint16_t b; + uint32_t c; + a = b = c = 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_uintxx_t="yes" +else $as_nop + ac_cv_have_uintxx_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_uintxx_t" >&5 +printf "%s\n" "$ac_cv_have_uintxx_t" >&6; } + if test "x$ac_cv_have_uintxx_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_UINTXX_T 1" >>confdefs.h + + fi +fi + +if (test -z "$have_uintxx_t" && \ + test "x$ac_cv_header_stdint_h" = "xyes") +then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uintXX_t types in stdint.h" >&5 +printf %s "checking for uintXX_t types in stdint.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + printf "%s\n" "#define HAVE_UINTXX_T 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +if (test -z "$have_uintxx_t" && \ + test "x$ac_cv_header_inttypes_h" = "xyes") +then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uintXX_t types in inttypes.h" >&5 +printf %s "checking for uintXX_t types in inttypes.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + printf "%s\n" "#define HAVE_UINTXX_T 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \ + test "x$ac_cv_header_sys_bitypes_h" = "xyes") +then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 +printf %s "checking for intXX_t and u_intXX_t types in sys/bitypes.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include + +int +main (void) +{ + + int8_t a; int16_t b; int32_t c; + u_int8_t e; u_int16_t f; u_int32_t g; + a = b = c = e = f = g = 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + printf "%s\n" "#define HAVE_U_INTXX_T 1" >>confdefs.h + + printf "%s\n" "#define HAVE_INTXX_T 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for u_char" >&5 +printf %s "checking for u_char... " >&6; } +if test ${ac_cv_have_u_char+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + u_char foo; foo = 125; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_u_char="yes" +else $as_nop + ac_cv_have_u_char="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_u_char" >&5 +printf "%s\n" "$ac_cv_have_u_char" >&6; } +if test "x$ac_cv_have_u_char" = "xyes" ; then + +printf "%s\n" "#define HAVE_U_CHAR 1" >>confdefs.h + +fi + +ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" " +#include +#ifdef HAVE_STDINT_H +# include +#endif + +" +if test "x$ac_cv_type_intmax_t" = xyes +then : + +printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h + + +fi +ac_fn_c_check_type "$LINENO" "uintmax_t" "ac_cv_type_uintmax_t" " +#include +#ifdef HAVE_STDINT_H +# include +#endif + +" +if test "x$ac_cv_type_uintmax_t" = xyes +then : + +printf "%s\n" "#define HAVE_UINTMAX_T 1" >>confdefs.h + + +fi + + + + ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include +#include +" +if test "x$ac_cv_type_socklen_t" = xyes +then : + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5 +printf %s "checking for socklen_t equivalent... " >&6; } + if test ${curl_cv_socklen_t_equiv+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + # Systems have either "struct sockaddr *" or + # "void *" as the second argument to getpeername + curl_cv_socklen_t_equiv= + for arg2 in "struct sockaddr" void; do + for t in int size_t unsigned long "unsigned long"; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + #include + int getpeername (int, $arg2 *, $t *); + +int +main (void) +{ + + $t len; + getpeername(0,0,&len); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + curl_cv_socklen_t_equiv="$t" + break + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + done + + if test "x$curl_cv_socklen_t_equiv" = x; then + as_fn_error $? "Cannot find a type to use in place of socklen_t" "$LINENO" 5 + fi + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl_cv_socklen_t_equiv" >&5 +printf "%s\n" "$curl_cv_socklen_t_equiv" >&6; } + +printf "%s\n" "#define socklen_t $curl_cv_socklen_t_equiv" >>confdefs.h + +fi + + + +ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "#include +" +if test "x$ac_cv_type_sig_atomic_t" = xyes +then : + +printf "%s\n" "#define HAVE_SIG_ATOMIC_T 1" >>confdefs.h + + +fi +ac_fn_c_check_type "$LINENO" "sighandler_t" "ac_cv_type_sighandler_t" "#include +" +if test "x$ac_cv_type_sighandler_t" = xyes +then : + +printf "%s\n" "#define HAVE_SIGHANDLER_T 1" >>confdefs.h + + +fi + +ac_fn_c_check_type "$LINENO" "fsblkcnt_t" "ac_cv_type_fsblkcnt_t" " +#include +#ifdef HAVE_SYS_BITYPES_H +#include +#endif +#ifdef HAVE_SYS_STATFS_H +#include +#endif +#ifdef HAVE_SYS_STATVFS_H +#include +#endif + +" +if test "x$ac_cv_type_fsblkcnt_t" = xyes +then : + +printf "%s\n" "#define HAVE_FSBLKCNT_T 1" >>confdefs.h + + +fi +ac_fn_c_check_type "$LINENO" "fsfilcnt_t" "ac_cv_type_fsfilcnt_t" " +#include +#ifdef HAVE_SYS_BITYPES_H +#include +#endif +#ifdef HAVE_SYS_STATFS_H +#include +#endif +#ifdef HAVE_SYS_STATVFS_H +#include +#endif + +" +if test "x$ac_cv_type_fsfilcnt_t" = xyes +then : + +printf "%s\n" "#define HAVE_FSFILCNT_T 1" >>confdefs.h + + +fi + + +ac_fn_c_check_member "$LINENO" "struct statfs" "f_files" "ac_cv_member_struct_statfs_f_files" " +#include +#include +#ifdef HAVE_SYS_BITYPES_H +#include +#endif +#ifdef HAVE_SYS_STATFS_H +#include +#endif +#ifdef HAVE_SYS_STATVFS_H +#include +#endif +#ifdef HAVE_SYS_VFS_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif + +" +if test "x$ac_cv_member_struct_statfs_f_files" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_STATFS_F_FILES 1" >>confdefs.h + + +fi +ac_fn_c_check_member "$LINENO" "struct statfs" "f_flags" "ac_cv_member_struct_statfs_f_flags" " +#include +#include +#ifdef HAVE_SYS_BITYPES_H +#include +#endif +#ifdef HAVE_SYS_STATFS_H +#include +#endif +#ifdef HAVE_SYS_STATVFS_H +#include +#endif +#ifdef HAVE_SYS_VFS_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif + +" +if test "x$ac_cv_member_struct_statfs_f_flags" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_STATFS_F_FLAGS 1" >>confdefs.h + + +fi + + + +ac_fn_c_check_type "$LINENO" "in_addr_t" "ac_cv_type_in_addr_t" "#include +#include +" +if test "x$ac_cv_type_in_addr_t" = xyes +then : + +printf "%s\n" "#define HAVE_IN_ADDR_T 1" >>confdefs.h + + +fi +ac_fn_c_check_type "$LINENO" "in_port_t" "ac_cv_type_in_port_t" "#include +#include +" +if test "x$ac_cv_type_in_port_t" = xyes +then : + +printf "%s\n" "#define HAVE_IN_PORT_T 1" >>confdefs.h + + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for size_t" >&5 +printf %s "checking for size_t... " >&6; } +if test ${ac_cv_have_size_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + size_t foo; foo = 1235; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_size_t="yes" +else $as_nop + ac_cv_have_size_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_size_t" >&5 +printf "%s\n" "$ac_cv_have_size_t" >&6; } +if test "x$ac_cv_have_size_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_SIZE_T 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5 +printf %s "checking for ssize_t... " >&6; } +if test ${ac_cv_have_ssize_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + ssize_t foo; foo = 1235; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_ssize_t="yes" +else $as_nop + ac_cv_have_ssize_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_ssize_t" >&5 +printf "%s\n" "$ac_cv_have_ssize_t" >&6; } +if test "x$ac_cv_have_ssize_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_t" >&5 +printf %s "checking for clock_t... " >&6; } +if test ${ac_cv_have_clock_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + clock_t foo; foo = 1235; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_clock_t="yes" +else $as_nop + ac_cv_have_clock_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_clock_t" >&5 +printf "%s\n" "$ac_cv_have_clock_t" >&6; } +if test "x$ac_cv_have_clock_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_CLOCK_T 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5 +printf %s "checking for sa_family_t... " >&6; } +if test ${ac_cv_have_sa_family_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + sa_family_t foo; foo = 1235; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_sa_family_t="yes" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main (void) +{ + sa_family_t foo; foo = 1235; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_sa_family_t="yes" +else $as_nop + ac_cv_have_sa_family_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_sa_family_t" >&5 +printf "%s\n" "$ac_cv_have_sa_family_t" >&6; } +if test "x$ac_cv_have_sa_family_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_SA_FAMILY_T 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pid_t" >&5 +printf %s "checking for pid_t... " >&6; } +if test ${ac_cv_have_pid_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + pid_t foo; foo = 1235; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_pid_t="yes" +else $as_nop + ac_cv_have_pid_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pid_t" >&5 +printf "%s\n" "$ac_cv_have_pid_t" >&6; } +if test "x$ac_cv_have_pid_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_PID_T 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mode_t" >&5 +printf %s "checking for mode_t... " >&6; } +if test ${ac_cv_have_mode_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + mode_t foo; foo = 1235; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_mode_t="yes" +else $as_nop + ac_cv_have_mode_t="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_mode_t" >&5 +printf "%s\n" "$ac_cv_have_mode_t" >&6; } +if test "x$ac_cv_have_mode_t" = "xyes" ; then + +printf "%s\n" "#define HAVE_MODE_T 1" >>confdefs.h + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 +printf %s "checking for struct sockaddr_storage... " >&6; } +if test ${ac_cv_have_struct_sockaddr_storage+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + struct sockaddr_storage s; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_struct_sockaddr_storage="yes" +else $as_nop + ac_cv_have_struct_sockaddr_storage="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_sockaddr_storage" >&5 +printf "%s\n" "$ac_cv_have_struct_sockaddr_storage" >&6; } +if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then + +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5 +printf %s "checking for struct sockaddr_in6... " >&6; } +if test ${ac_cv_have_struct_sockaddr_in6+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + struct sockaddr_in6 s; s.sin6_family = 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_struct_sockaddr_in6="yes" +else $as_nop + ac_cv_have_struct_sockaddr_in6="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_sockaddr_in6" >&5 +printf "%s\n" "$ac_cv_have_struct_sockaddr_in6" >&6; } +if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then + +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_IN6 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct in6_addr" >&5 +printf %s "checking for struct in6_addr... " >&6; } +if test ${ac_cv_have_struct_in6_addr+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + struct in6_addr s; s.s6_addr[0] = 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_struct_in6_addr="yes" +else $as_nop + ac_cv_have_struct_in6_addr="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_in6_addr" >&5 +printf "%s\n" "$ac_cv_have_struct_in6_addr" >&6; } +if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then + +printf "%s\n" "#define HAVE_STRUCT_IN6_ADDR 1" >>confdefs.h + + + ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" " +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#include + +" +if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1" >>confdefs.h + + +fi + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5 +printf %s "checking for struct addrinfo... " >&6; } +if test ${ac_cv_have_struct_addrinfo+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main (void) +{ + struct addrinfo s; s.ai_flags = AI_PASSIVE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_struct_addrinfo="yes" +else $as_nop + ac_cv_have_struct_addrinfo="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_addrinfo" >&5 +printf "%s\n" "$ac_cv_have_struct_addrinfo" >&6; } +if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then + +printf "%s\n" "#define HAVE_STRUCT_ADDRINFO 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5 +printf %s "checking for struct timeval... " >&6; } +if test ${ac_cv_have_struct_timeval+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + struct timeval tv; tv.tv_sec = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_struct_timeval="yes" +else $as_nop + ac_cv_have_struct_timeval="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_timeval" >&5 +printf "%s\n" "$ac_cv_have_struct_timeval" >&6; } +if test "x$ac_cv_have_struct_timeval" = "xyes" ; then + +printf "%s\n" "#define HAVE_STRUCT_TIMEVAL 1" >>confdefs.h + + have_struct_timeval=1 +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec" >&5 +printf %s "checking for struct timespec... " >&6; } +if test ${ac_cv_have_struct_timespec+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #ifdef HAVE_SYS_TIME_H + # include + #endif + #ifdef HAVE_TIME_H + # include + #endif + +int +main (void) +{ + struct timespec ts; ts.tv_sec = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_struct_timespec="yes" +else $as_nop + ac_cv_have_struct_timespec="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_timespec" >&5 +printf "%s\n" "$ac_cv_have_struct_timespec" >&6; } +if test "x$ac_cv_have_struct_timespec" = "xyes" ; then + +printf "%s\n" "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h + + have_struct_timespec=1 +fi + +# We need int64_t or else certain parts of the compile will fail. +if test "x$ac_cv_have_int64_t" = "xno" && \ + test "x$ac_cv_sizeof_long_int" != "x8" && \ + test "x$ac_cv_sizeof_long_long_int" = "x0" ; then + echo "OpenSSH requires int64_t support. Contact your vendor or install" + echo "an alternative compiler (I.E., GCC) before continuing." + echo "" + exit 1; +else + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Assuming working snprintf()" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: Assuming working snprintf()" >&2;} + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#ifdef HAVE_SNPRINTF +int main(void) +{ + char buf[50]; + char expected_out[50]; + int mazsize = 50 ; +#if (SIZEOF_LONG_INT == 8) + long int num = 0x7fffffffffffffff; +#else + long long num = 0x7fffffffffffffffll; +#endif + strcpy(expected_out, "9223372036854775807"); +#if (SIZEOF_LONG_INT == 8) + snprintf(buf, mazsize, "%ld", num); +#else + snprintf(buf, mazsize, "%lld", num); +#endif + if(strcmp(buf, expected_out) != 0) + exit(1); + exit(0); +} +#else +int main(void) { exit(0); } +#endif + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + true +else $as_nop + printf "%s\n" "#define BROKEN_SNPRINTF 1" >>confdefs.h + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + + +# look for field 'ut_host' in header 'utmp.h' + ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_host field in utmp.h" >&5 +printf %s "checking for ut_host field in utmp.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_host" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_HOST_IN_UTMP 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_host' in header 'utmpx.h' + ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_host field in utmpx.h" >&5 +printf %s "checking for ut_host field in utmpx.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_host" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_HOST_IN_UTMPX 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'syslen' in header 'utmpx.h' + ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"syslen + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for syslen field in utmpx.h" >&5 +printf %s "checking for syslen field in utmpx.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "syslen" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_SYSLEN_IN_UTMPX 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_pid' in header 'utmp.h' + ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_pid field in utmp.h" >&5 +printf %s "checking for ut_pid field in utmp.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_pid" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_PID_IN_UTMP 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_type' in header 'utmp.h' + ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_type field in utmp.h" >&5 +printf %s "checking for ut_type field in utmp.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_type" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_TYPE_IN_UTMP 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_type' in header 'utmpx.h' + ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_type field in utmpx.h" >&5 +printf %s "checking for ut_type field in utmpx.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_type" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_TYPE_IN_UTMPX 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_tv' in header 'utmp.h' + ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_tv field in utmp.h" >&5 +printf %s "checking for ut_tv field in utmp.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_tv" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_TV_IN_UTMP 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_id' in header 'utmp.h' + ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_id field in utmp.h" >&5 +printf %s "checking for ut_id field in utmp.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_id" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_ID_IN_UTMP 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_id' in header 'utmpx.h' + ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_id field in utmpx.h" >&5 +printf %s "checking for ut_id field in utmpx.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_id" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_ID_IN_UTMPX 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_addr' in header 'utmp.h' + ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_addr field in utmp.h" >&5 +printf %s "checking for ut_addr field in utmp.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_addr" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_ADDR_IN_UTMP 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_addr' in header 'utmpx.h' + ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_addr field in utmpx.h" >&5 +printf %s "checking for ut_addr field in utmpx.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_addr" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_ADDR_IN_UTMPX 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_addr_v6' in header 'utmp.h' + ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_addr_v6 field in utmp.h" >&5 +printf %s "checking for ut_addr_v6 field in utmp.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_addr_v6" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_ADDR_V6_IN_UTMP 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_addr_v6' in header 'utmpx.h' + ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_addr_v6 field in utmpx.h" >&5 +printf %s "checking for ut_addr_v6 field in utmpx.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_addr_v6" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_ADDR_V6_IN_UTMPX 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_exit' in header 'utmp.h' + ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_exit + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_exit field in utmp.h" >&5 +printf %s "checking for ut_exit field in utmp.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_exit" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_EXIT_IN_UTMP 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_time' in header 'utmp.h' + ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_time field in utmp.h" >&5 +printf %s "checking for ut_time field in utmp.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_time" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_TIME_IN_UTMP 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_time' in header 'utmpx.h' + ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_time field in utmpx.h" >&5 +printf %s "checking for ut_time field in utmpx.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_time" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_TIME_IN_UTMPX 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_tv' in header 'utmpx.h' + ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_tv field in utmpx.h" >&5 +printf %s "checking for ut_tv field in utmpx.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_tv" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_TV_IN_UTMPX 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +# look for field 'ut_ss' in header 'utmpx.h' + ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_ss + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_ss field in utmpx.h" >&5 +printf %s "checking for ut_ss field in utmpx.h... " >&6; } + if eval test \${$ossh_varname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "ut_ss" >/dev/null 2>&1 +then : + eval "$ossh_varname=yes" +else $as_nop + eval "$ossh_varname=no" +fi +rm -rf conftest* + +fi + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5 +printf "%s\n" "$ossh_result" >&6; } + if test "x$ossh_result" = "xyes"; then + +printf "%s\n" "#define HAVE_SS_IN_UTMPX 1" >>confdefs.h + + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + + +ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_blksize" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h + + +fi + +ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_mtim" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_MTIM 1" >>confdefs.h + + +fi + +ac_fn_c_check_member "$LINENO" "struct stat" "st_mtime" "ac_cv_member_struct_stat_st_mtime" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_mtime" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_MTIME 1" >>confdefs.h + + +fi + +ac_fn_c_check_member "$LINENO" "struct passwd" "pw_gecos" "ac_cv_member_struct_passwd_pw_gecos" " +#include +#include + +" +if test "x$ac_cv_member_struct_passwd_pw_gecos" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_PASSWD_PW_GECOS 1" >>confdefs.h + + +fi +ac_fn_c_check_member "$LINENO" "struct passwd" "pw_class" "ac_cv_member_struct_passwd_pw_class" " +#include +#include + +" +if test "x$ac_cv_member_struct_passwd_pw_class" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_PASSWD_PW_CLASS 1" >>confdefs.h + + +fi +ac_fn_c_check_member "$LINENO" "struct passwd" "pw_change" "ac_cv_member_struct_passwd_pw_change" " +#include +#include + +" +if test "x$ac_cv_member_struct_passwd_pw_change" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_PASSWD_PW_CHANGE 1" >>confdefs.h + + +fi +ac_fn_c_check_member "$LINENO" "struct passwd" "pw_expire" "ac_cv_member_struct_passwd_pw_expire" " +#include +#include + +" +if test "x$ac_cv_member_struct_passwd_pw_expire" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_PASSWD_PW_EXPIRE 1" >>confdefs.h + + +fi + + +ac_fn_c_check_member "$LINENO" "struct __res_state" "retrans" "ac_cv_member_struct___res_state_retrans" " +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#include +#include +#include + +" +if test "x$ac_cv_member_struct___res_state_retrans" = xyes +then : + +else $as_nop + +printf "%s\n" "#define __res_state state" >>confdefs.h + +fi + + +ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" " +#include +#include +#include + + +" +if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes +then : + +printf "%s\n" "#define SOCK_HAS_LEN 1" >>confdefs.h + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ss_family field in struct sockaddr_storage" >&5 +printf %s "checking for ss_family field in struct sockaddr_storage... " >&6; } +if test ${ac_cv_have_ss_family_in_struct_ss+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + struct sockaddr_storage s; s.ss_family = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_ss_family_in_struct_ss="yes" +else $as_nop + ac_cv_have_ss_family_in_struct_ss="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_ss_family_in_struct_ss" >&5 +printf "%s\n" "$ac_cv_have_ss_family_in_struct_ss" >&6; } +if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then + +printf "%s\n" "#define HAVE_SS_FAMILY_IN_SS 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __ss_family field in struct sockaddr_storage" >&5 +printf %s "checking for __ss_family field in struct sockaddr_storage... " >&6; } +if test ${ac_cv_have___ss_family_in_struct_ss+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + struct sockaddr_storage s; s.__ss_family = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have___ss_family_in_struct_ss="yes" +else $as_nop + ac_cv_have___ss_family_in_struct_ss="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___ss_family_in_struct_ss" >&5 +printf "%s\n" "$ac_cv_have___ss_family_in_struct_ss" >&6; } +if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then + +printf "%s\n" "#define HAVE___SS_FAMILY_IN_SS 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for msg_accrights field in struct msghdr" >&5 +printf %s "checking for msg_accrights field in struct msghdr... " >&6; } +if test ${ac_cv_have_accrights_in_msghdr+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include + +int +main (void) +{ + +#ifdef msg_accrights +#error "msg_accrights is a macro" +exit(1); +#endif +struct msghdr m; +m.msg_accrights = 0; +exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_accrights_in_msghdr="yes" +else $as_nop + ac_cv_have_accrights_in_msghdr="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_accrights_in_msghdr" >&5 +printf "%s\n" "$ac_cv_have_accrights_in_msghdr" >&6; } +if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then + +printf "%s\n" "#define HAVE_ACCRIGHTS_IN_MSGHDR 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if struct statvfs.f_fsid is integral type" >&5 +printf %s "checking if struct statvfs.f_fsid is integral type... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#ifdef HAVE_SYS_TIME_H +# include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_STATVFS_H +#include +#endif + +int +main (void) +{ + struct statvfs s; s.f_fsid = 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if fsid_t has member val" >&5 +printf %s "checking if fsid_t has member val... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + fsid_t t; t.val[0] = 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define FSID_HAS_VAL 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if f_fsid has member __val" >&5 +printf %s "checking if f_fsid has member __val... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main (void) +{ + fsid_t t; t.__val[0] = 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define FSID_HAS___VAL 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for msg_control field in struct msghdr" >&5 +printf %s "checking for msg_control field in struct msghdr... " >&6; } +if test ${ac_cv_have_control_in_msghdr+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include + +int +main (void) +{ + +#ifdef msg_control +#error "msg_control is a macro" +exit(1); +#endif +struct msghdr m; +m.msg_control = 0; +exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_have_control_in_msghdr="yes" +else $as_nop + ac_cv_have_control_in_msghdr="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_control_in_msghdr" >&5 +printf "%s\n" "$ac_cv_have_control_in_msghdr" >&6; } +if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then + +printf "%s\n" "#define HAVE_CONTROL_IN_MSGHDR 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libc defines __progname" >&5 +printf %s "checking if libc defines __progname... " >&6; } +if test ${ac_cv_libc_defines___progname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + extern char *__progname; printf("%s", __progname); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_libc_defines___progname="yes" +else $as_nop + ac_cv_libc_defines___progname="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines___progname" >&5 +printf "%s\n" "$ac_cv_libc_defines___progname" >&6; } +if test "x$ac_cv_libc_defines___progname" = "xyes" ; then + +printf "%s\n" "#define HAVE___PROGNAME 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC implements __FUNCTION__" >&5 +printf %s "checking whether $CC implements __FUNCTION__... " >&6; } +if test ${ac_cv_cc_implements___FUNCTION__+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + printf("%s", __FUNCTION__); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cc_implements___FUNCTION__="yes" +else $as_nop + ac_cv_cc_implements___FUNCTION__="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_implements___FUNCTION__" >&5 +printf "%s\n" "$ac_cv_cc_implements___FUNCTION__" >&6; } +if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then + +printf "%s\n" "#define HAVE___FUNCTION__ 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC implements __func__" >&5 +printf %s "checking whether $CC implements __func__... " >&6; } +if test ${ac_cv_cc_implements___func__+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + printf("%s", __func__); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cc_implements___func__="yes" +else $as_nop + ac_cv_cc_implements___func__="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_implements___func__" >&5 +printf "%s\n" "$ac_cv_cc_implements___func__" >&6; } +if test "x$ac_cv_cc_implements___func__" = "xyes" ; then + +printf "%s\n" "#define HAVE___func__ 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether va_copy exists" >&5 +printf %s "checking whether va_copy exists... " >&6; } +if test ${ac_cv_have_va_copy+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +va_list x,y; + +int +main (void) +{ + va_copy(x,y); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_have_va_copy="yes" +else $as_nop + ac_cv_have_va_copy="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_va_copy" >&5 +printf "%s\n" "$ac_cv_have_va_copy" >&6; } +if test "x$ac_cv_have_va_copy" = "xyes" ; then + +printf "%s\n" "#define HAVE_VA_COPY 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __va_copy exists" >&5 +printf %s "checking whether __va_copy exists... " >&6; } +if test ${ac_cv_have___va_copy+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +va_list x,y; + +int +main (void) +{ + __va_copy(x,y); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_have___va_copy="yes" +else $as_nop + ac_cv_have___va_copy="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___va_copy" >&5 +printf "%s\n" "$ac_cv_have___va_copy" >&6; } +if test "x$ac_cv_have___va_copy" = "xyes" ; then + +printf "%s\n" "#define HAVE___VA_COPY 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getopt has optreset support" >&5 +printf %s "checking whether getopt has optreset support... " >&6; } +if test ${ac_cv_have_getopt_optreset+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + extern int optreset; optreset = 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_have_getopt_optreset="yes" +else $as_nop + ac_cv_have_getopt_optreset="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getopt_optreset" >&5 +printf "%s\n" "$ac_cv_have_getopt_optreset" >&6; } +if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then + +printf "%s\n" "#define HAVE_GETOPT_OPTRESET 1" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libc defines sys_errlist" >&5 +printf %s "checking if libc defines sys_errlist... " >&6; } +if test ${ac_cv_libc_defines_sys_errlist+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_libc_defines_sys_errlist="yes" +else $as_nop + ac_cv_libc_defines_sys_errlist="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines_sys_errlist" >&5 +printf "%s\n" "$ac_cv_libc_defines_sys_errlist" >&6; } +if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then + +printf "%s\n" "#define HAVE_SYS_ERRLIST 1" >>confdefs.h + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libc defines sys_nerr" >&5 +printf %s "checking if libc defines sys_nerr... " >&6; } +if test ${ac_cv_libc_defines_sys_nerr+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main (void) +{ + extern int sys_nerr; printf("%i", sys_nerr); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_libc_defines_sys_nerr="yes" +else $as_nop + ac_cv_libc_defines_sys_nerr="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines_sys_nerr" >&5 +printf "%s\n" "$ac_cv_libc_defines_sys_nerr" >&6; } +if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then + +printf "%s\n" "#define HAVE_SYS_NERR 1" >>confdefs.h + +fi + +# Check libraries needed by DNS fingerprint support +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getrrsetbyname" >&5 +printf %s "checking for library containing getrrsetbyname... " >&6; } +if test ${ac_cv_search_getrrsetbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char getrrsetbyname (); +int +main (void) +{ +return getrrsetbyname (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_getrrsetbyname=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_getrrsetbyname+y} +then : + break +fi +done +if test ${ac_cv_search_getrrsetbyname+y} +then : + +else $as_nop + ac_cv_search_getrrsetbyname=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getrrsetbyname" >&5 +printf "%s\n" "$ac_cv_search_getrrsetbyname" >&6; } +ac_res=$ac_cv_search_getrrsetbyname +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +printf "%s\n" "#define HAVE_GETRRSETBYNAME 1" >>confdefs.h + +else $as_nop + + # Needed by our getrrsetbyname() + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_query" >&5 +printf %s "checking for library containing res_query... " >&6; } +if test ${ac_cv_search_res_query+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char res_query (); +int +main (void) +{ +return res_query (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_res_query=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_res_query+y} +then : + break +fi +done +if test ${ac_cv_search_res_query+y} +then : + +else $as_nop + ac_cv_search_res_query=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_query" >&5 +printf "%s\n" "$ac_cv_search_res_query" >&6; } +ac_res=$ac_cv_search_res_query +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dn_expand" >&5 +printf %s "checking for library containing dn_expand... " >&6; } +if test ${ac_cv_search_dn_expand+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char dn_expand (); +int +main (void) +{ +return dn_expand (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_dn_expand=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_dn_expand+y} +then : + break +fi +done +if test ${ac_cv_search_dn_expand+y} +then : + +else $as_nop + ac_cv_search_dn_expand=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dn_expand" >&5 +printf "%s\n" "$ac_cv_search_dn_expand" >&6; } +ac_res=$ac_cv_search_dn_expand +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if res_query will link" >&5 +printf %s "checking if res_query will link... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include + +int +main (void) +{ + + res_query (0, 0, 0, 0, 0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + saved_LIBS="$LIBS" + LIBS="$LIBS -lresolv" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv" >&5 +printf %s "checking for res_query in -lresolv... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#include + +int +main (void) +{ + + res_query (0, 0, 0, 0, 0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + LIBS="$saved_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + ac_fn_c_check_func "$LINENO" "_getshort" "ac_cv_func__getshort" +if test "x$ac_cv_func__getshort" = xyes +then : + printf "%s\n" "#define HAVE__GETSHORT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "_getlong" "ac_cv_func__getlong" +if test "x$ac_cv_func__getlong" = xyes +then : + printf "%s\n" "#define HAVE__GETLONG 1" >>confdefs.h + +fi + + ac_fn_check_decl "$LINENO" "_getshort" "ac_cv_have_decl__getshort" "#include + #include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl__getshort" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL__GETSHORT $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "_getlong" "ac_cv_have_decl__getlong" "#include + #include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl__getlong" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL__GETLONG $ac_have_decl" >>confdefs.h + + ac_fn_c_check_member "$LINENO" "HEADER" "ad" "ac_cv_member_HEADER_ad" "#include +" +if test "x$ac_cv_member_HEADER_ad" = xyes +then : + +printf "%s\n" "#define HAVE_HEADER_AD 1" >>confdefs.h + +fi + + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if struct __res_state _res is an extern" >&5 +printf %s "checking if struct __res_state _res is an extern... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#include +#include +#include +extern struct __res_state _res; + +int +main (void) +{ + +struct __res_state *volatile p = &_res; /* force resolution of _res */ +return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAVE__RES_EXTERN 1" >>confdefs.h + + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +# Check whether user wants SELinux support +SELINUX_MSG="no" +LIBSELINUX="" + +# Check whether --with-selinux was given. +if test ${with_selinux+y} +then : + withval=$with_selinux; if test "x$withval" != "xno" ; then + save_LIBS="$LIBS" + +printf "%s\n" "#define WITH_SELINUX 1" >>confdefs.h + + SELINUX_MSG="yes" + ac_fn_c_check_header_compile "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default" +if test "x$ac_cv_header_selinux_selinux_h" = xyes +then : + +else $as_nop + as_fn_error $? "SELinux support requires selinux.h header" "$LINENO" 5 +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setexeccon in -lselinux" >&5 +printf %s "checking for setexeccon in -lselinux... " >&6; } +if test ${ac_cv_lib_selinux_setexeccon+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lselinux $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char setexeccon (); +int +main (void) +{ +return setexeccon (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_selinux_setexeccon=yes +else $as_nop + ac_cv_lib_selinux_setexeccon=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_setexeccon" >&5 +printf "%s\n" "$ac_cv_lib_selinux_setexeccon" >&6; } +if test "x$ac_cv_lib_selinux_setexeccon" = xyes +then : + LIBSELINUX="-lselinux" + LIBS="$LIBS -lselinux" + +else $as_nop + as_fn_error $? "SELinux support requires libselinux library" "$LINENO" 5 +fi + + ac_fn_c_check_func "$LINENO" "getseuserbyname" "ac_cv_func_getseuserbyname" +if test "x$ac_cv_func_getseuserbyname" = xyes +then : + printf "%s\n" "#define HAVE_GETSEUSERBYNAME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "get_default_context_with_level" "ac_cv_func_get_default_context_with_level" +if test "x$ac_cv_func_get_default_context_with_level" = xyes +then : + printf "%s\n" "#define HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL 1" >>confdefs.h + +fi + + LIBS="$save_LIBS $LIBSELINUX" + fi + +fi + + + +# Check whether user wants Kerberos 5 support +KRB5_MSG="no" + +# Check whether --with-kerberos5 was given. +if test ${with_kerberos5+y} +then : + withval=$with_kerberos5; if test "x$withval" != "xno" ; then + if test "x$withval" = "xyes" ; then + KRB5ROOT="/usr/local" + else + KRB5ROOT=${withval} + fi + + +printf "%s\n" "#define KRB5 1" >>confdefs.h + + KRB5_MSG="yes" + + use_pkgconfig_for_krb5= + if test "x$PKGCONFIG" != "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $PKGCONFIG knows about kerberos5" >&5 +printf %s "checking if $PKGCONFIG knows about kerberos5... " >&6; } + if "$PKGCONFIG" krb5; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + use_pkgconfig_for_krb5=yes + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + fi + if test "x$use_pkgconfig_for_krb5" = "xyes"; then + K5CFLAGS=`$PKGCONFIG --cflags krb5` + K5LIBS=`$PKGCONFIG --libs krb5` + CPPFLAGS="$CPPFLAGS $K5CFLAGS" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gssapi support" >&5 +printf %s "checking for gssapi support... " >&6; } + if "$PKGCONFIG" krb5-gssapi; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define GSSAPI 1" >>confdefs.h + + GSSCFLAGS="`$PKGCONFIG --cflags krb5-gssapi`" + GSSLIBS="`$PKGCONFIG --libs krb5-gssapi`" + CPPFLAGS="$CPPFLAGS $GSSCFLAGS" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Heimdal" >&5 +printf %s "checking whether we are using Heimdal... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include + +int +main (void) +{ + char *tmp = heimdal_version; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HEIMDAL 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + else + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}krb5-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}krb5-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_KRB5CONF+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $KRB5CONF in + [\\/]* | ?:[\\/]*) + ac_cv_path_KRB5CONF="$KRB5CONF" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$KRB5ROOT/bin:$PATH" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_KRB5CONF="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +KRB5CONF=$ac_cv_path_KRB5CONF +if test -n "$KRB5CONF"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $KRB5CONF" >&5 +printf "%s\n" "$KRB5CONF" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_KRB5CONF"; then + ac_pt_KRB5CONF=$KRB5CONF + # Extract the first word of "krb5-config", so it can be a program name with args. +set dummy krb5-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_KRB5CONF+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ac_pt_KRB5CONF in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_KRB5CONF="$ac_pt_KRB5CONF" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$KRB5ROOT/bin:$PATH" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_KRB5CONF="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_KRB5CONF=$ac_cv_path_ac_pt_KRB5CONF +if test -n "$ac_pt_KRB5CONF"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_KRB5CONF" >&5 +printf "%s\n" "$ac_pt_KRB5CONF" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_KRB5CONF" = x; then + KRB5CONF="$KRB5ROOT/bin/krb5-config" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + KRB5CONF=$ac_pt_KRB5CONF + fi +else + KRB5CONF="$ac_cv_path_KRB5CONF" +fi + + if test -x $KRB5CONF ; then + K5CFLAGS="`$KRB5CONF --cflags`" + K5LIBS="`$KRB5CONF --libs`" + CPPFLAGS="$CPPFLAGS $K5CFLAGS" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gssapi support" >&5 +printf %s "checking for gssapi support... " >&6; } + if $KRB5CONF | grep gssapi >/dev/null ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define GSSAPI 1" >>confdefs.h + + GSSCFLAGS="`$KRB5CONF --cflags gssapi`" + GSSLIBS="`$KRB5CONF --libs gssapi`" + CPPFLAGS="$CPPFLAGS $GSSCFLAGS" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Heimdal" >&5 +printf %s "checking whether we are using Heimdal... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include + +int +main (void) +{ + char *tmp = heimdal_version; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HEIMDAL 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + else + CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include" + LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Heimdal" >&5 +printf %s "checking whether we are using Heimdal... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include + +int +main (void) +{ + char *tmp = heimdal_version; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HEIMDAL 1" >>confdefs.h + + K5LIBS="-lkrb5" + K5LIBS="$K5LIBS -lcom_err -lasn1" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for net_write in -lroken" >&5 +printf %s "checking for net_write in -lroken... " >&6; } +if test ${ac_cv_lib_roken_net_write+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lroken $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char net_write (); +int +main (void) +{ +return net_write (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_roken_net_write=yes +else $as_nop + ac_cv_lib_roken_net_write=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_roken_net_write" >&5 +printf "%s\n" "$ac_cv_lib_roken_net_write" >&6; } +if test "x$ac_cv_lib_roken_net_write" = xyes +then : + K5LIBS="$K5LIBS -lroken" +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5 +printf %s "checking for des_cbc_encrypt in -ldes... " >&6; } +if test ${ac_cv_lib_des_des_cbc_encrypt+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldes $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char des_cbc_encrypt (); +int +main (void) +{ +return des_cbc_encrypt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_des_des_cbc_encrypt=yes +else $as_nop + ac_cv_lib_des_des_cbc_encrypt=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 +printf "%s\n" "$ac_cv_lib_des_des_cbc_encrypt" >&6; } +if test "x$ac_cv_lib_des_des_cbc_encrypt" = xyes +then : + K5LIBS="$K5LIBS -ldes" +fi + + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + K5LIBS="-lkrb5 -lk5crypto -lcom_err" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dn_expand" >&5 +printf %s "checking for library containing dn_expand... " >&6; } +if test ${ac_cv_search_dn_expand+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char dn_expand (); +int +main (void) +{ +return dn_expand (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_dn_expand=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_dn_expand+y} +then : + break +fi +done +if test ${ac_cv_search_dn_expand+y} +then : + +else $as_nop + ac_cv_search_dn_expand=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dn_expand" >&5 +printf "%s\n" "$ac_cv_search_dn_expand" >&6; } +ac_res=$ac_cv_search_dn_expand +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgssapi_krb5" >&5 +printf %s "checking for gss_init_sec_context in -lgssapi_krb5... " >&6; } +if test ${ac_cv_lib_gssapi_krb5_gss_init_sec_context+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgssapi_krb5 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char gss_init_sec_context (); +int +main (void) +{ +return gss_init_sec_context (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes +else $as_nop + ac_cv_lib_gssapi_krb5_gss_init_sec_context=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5 +printf "%s\n" "$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6; } +if test "x$ac_cv_lib_gssapi_krb5_gss_init_sec_context" = xyes +then : + printf "%s\n" "#define GSSAPI 1" >>confdefs.h + + GSSLIBS="-lgssapi_krb5" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgssapi" >&5 +printf %s "checking for gss_init_sec_context in -lgssapi... " >&6; } +if test ${ac_cv_lib_gssapi_gss_init_sec_context+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgssapi $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char gss_init_sec_context (); +int +main (void) +{ +return gss_init_sec_context (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_gssapi_gss_init_sec_context=yes +else $as_nop + ac_cv_lib_gssapi_gss_init_sec_context=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5 +printf "%s\n" "$ac_cv_lib_gssapi_gss_init_sec_context" >&6; } +if test "x$ac_cv_lib_gssapi_gss_init_sec_context" = xyes +then : + printf "%s\n" "#define GSSAPI 1" >>confdefs.h + + GSSLIBS="-lgssapi" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgss" >&5 +printf %s "checking for gss_init_sec_context in -lgss... " >&6; } +if test ${ac_cv_lib_gss_gss_init_sec_context+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgss $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char gss_init_sec_context (); +int +main (void) +{ +return gss_init_sec_context (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_gss_gss_init_sec_context=yes +else $as_nop + ac_cv_lib_gss_gss_init_sec_context=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_init_sec_context" >&5 +printf "%s\n" "$ac_cv_lib_gss_gss_init_sec_context" >&6; } +if test "x$ac_cv_lib_gss_gss_init_sec_context" = xyes +then : + printf "%s\n" "#define GSSAPI 1" >>confdefs.h + + GSSLIBS="-lgss" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find any suitable gss-api library - build may fail" >&5 +printf "%s\n" "$as_me: WARNING: Cannot find any suitable gss-api library - build may fail" >&2;} +fi + + +fi + + +fi + + + ac_fn_c_check_header_compile "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_h" = xyes +then : + +else $as_nop + unset ac_cv_header_gssapi_h + CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" + for ac_header in gssapi.h +do : + ac_fn_c_check_header_compile "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_h" = xyes +then : + printf "%s\n" "#define HAVE_GSSAPI_H 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find any suitable gss-api header - build may fail" >&5 +printf "%s\n" "$as_me: WARNING: Cannot find any suitable gss-api header - build may fail" >&2;} + +fi + +done + + +fi + + + oldCPP="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" + ac_fn_c_check_header_compile "$LINENO" "gssapi_krb5.h" "ac_cv_header_gssapi_krb5_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_krb5_h" = xyes +then : + +else $as_nop + CPPFLAGS="$oldCPP" +fi + + + fi + fi + if test -n "${rpath_opt}" ; then + LDFLAGS="$LDFLAGS ${rpath_opt}${KRB5ROOT}/lib" + fi + if test ! -z "$blibpath" ; then + blibpath="$blibpath:${KRB5ROOT}/lib" + fi + + ac_fn_c_check_header_compile "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_h" = xyes +then : + printf "%s\n" "#define HAVE_GSSAPI_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_gssapi_h" = xyes +then : + printf "%s\n" "#define HAVE_GSSAPI_GSSAPI_H 1" >>confdefs.h + +fi + + ac_fn_c_check_header_compile "$LINENO" "gssapi_krb5.h" "ac_cv_header_gssapi_krb5_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_krb5_h" = xyes +then : + printf "%s\n" "#define HAVE_GSSAPI_KRB5_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "gssapi/gssapi_krb5.h" "ac_cv_header_gssapi_gssapi_krb5_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_gssapi_krb5_h" = xyes +then : + printf "%s\n" "#define HAVE_GSSAPI_GSSAPI_KRB5_H 1" >>confdefs.h + +fi + + ac_fn_c_check_header_compile "$LINENO" "gssapi_generic.h" "ac_cv_header_gssapi_generic_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_generic_h" = xyes +then : + printf "%s\n" "#define HAVE_GSSAPI_GENERIC_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_gssapi_generic_h" = xyes +then : + printf "%s\n" "#define HAVE_GSSAPI_GSSAPI_GENERIC_H 1" >>confdefs.h + +fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing k_hasafs" >&5 +printf %s "checking for library containing k_hasafs... " >&6; } +if test ${ac_cv_search_k_hasafs+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char k_hasafs (); +int +main (void) +{ +return k_hasafs (); + ; + return 0; +} +_ACEOF +for ac_lib in '' kafs +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_k_hasafs=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_k_hasafs+y} +then : + break +fi +done +if test ${ac_cv_search_k_hasafs+y} +then : + +else $as_nop + ac_cv_search_k_hasafs=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_k_hasafs" >&5 +printf "%s\n" "$ac_cv_search_k_hasafs" >&6; } +ac_res=$ac_cv_search_k_hasafs +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +printf "%s\n" "#define USE_AFS 1" >>confdefs.h + +fi + + + ac_fn_check_decl "$LINENO" "GSS_C_NT_HOSTBASED_SERVICE" "ac_cv_have_decl_GSS_C_NT_HOSTBASED_SERVICE" " +#ifdef HAVE_GSSAPI_H +# include +#elif defined(HAVE_GSSAPI_GSSAPI_H) +# include +#endif + +#ifdef HAVE_GSSAPI_GENERIC_H +# include +#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H) +# include +#endif + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_GSS_C_NT_HOSTBASED_SERVICE" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE $ac_have_decl" >>confdefs.h + + saved_LIBS="$LIBS" + LIBS="$LIBS $K5LIBS" + ac_fn_c_check_func "$LINENO" "krb5_cc_new_unique" "ac_cv_func_krb5_cc_new_unique" +if test "x$ac_cv_func_krb5_cc_new_unique" = xyes +then : + printf "%s\n" "#define HAVE_KRB5_CC_NEW_UNIQUE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "krb5_get_error_message" "ac_cv_func_krb5_get_error_message" +if test "x$ac_cv_func_krb5_get_error_message" = xyes +then : + printf "%s\n" "#define HAVE_KRB5_GET_ERROR_MESSAGE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "krb5_free_error_message" "ac_cv_func_krb5_free_error_message" +if test "x$ac_cv_func_krb5_free_error_message" = xyes +then : + printf "%s\n" "#define HAVE_KRB5_FREE_ERROR_MESSAGE 1" >>confdefs.h + +fi + + LIBS="$saved_LIBS" + + fi + + +fi + + + + + +# Looking for programs, paths and files + +PRIVSEP_PATH=/var/empty + +# Check whether --with-privsep-path was given. +if test ${with_privsep_path+y} +then : + withval=$with_privsep_path; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + PRIVSEP_PATH=$withval + fi + + +fi + + + + +# Check whether --with-xauth was given. +if test ${with_xauth+y} +then : + withval=$with_xauth; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + xauth_path=$withval + fi + +else $as_nop + + TestPath="$PATH" + TestPath="${TestPath}${PATH_SEPARATOR}/usr/X/bin" + TestPath="${TestPath}${PATH_SEPARATOR}/usr/bin/X11" + TestPath="${TestPath}${PATH_SEPARATOR}/usr/X11R6/bin" + TestPath="${TestPath}${PATH_SEPARATOR}/usr/openwin/bin" + # Extract the first word of "xauth", so it can be a program name with args. +set dummy xauth; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_xauth_path+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $xauth_path in + [\\/]* | ?:[\\/]*) + ac_cv_path_xauth_path="$xauth_path" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $TestPath +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_xauth_path="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +xauth_path=$ac_cv_path_xauth_path +if test -n "$xauth_path"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xauth_path" >&5 +printf "%s\n" "$xauth_path" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then + xauth_path="/usr/openwin/bin/xauth" + fi + + +fi + + +STRIP_OPT=-s +# Check whether --enable-strip was given. +if test ${enable_strip+y} +then : + enableval=$enable_strip; + if test "x$enableval" = "xno" ; then + STRIP_OPT= + fi + + +fi + + + +if test -z "$xauth_path" ; then + XAUTH_PATH="undefined" + +else + +printf "%s\n" "#define XAUTH_PATH \"$xauth_path\"" >>confdefs.h + + XAUTH_PATH=$xauth_path + +fi + +# Check for mail directory + +# Check whether --with-maildir was given. +if test ${with_maildir+y} +then : + withval=$with_maildir; + if test "X$withval" != X && test "x$withval" != xno && \ + test "x${withval}" != xyes; then + +printf "%s\n" "#define MAIL_DIRECTORY \"$withval\"" >>confdefs.h + + fi + +else $as_nop + + if test "X$maildir" != "X"; then + printf "%s\n" "#define MAIL_DIRECTORY \"$maildir\"" >>confdefs.h + + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Discovering system mail directory" >&5 +printf %s "checking Discovering system mail directory... " >&6; } + if test "$cross_compiling" = yes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: use --with-maildir=/path/to/mail" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: use --with-maildir=/path/to/mail" >&2;} + + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#ifdef HAVE_PATHS_H +#include +#endif +#ifdef HAVE_MAILLOCK_H +#include +#endif +#define DATA "conftest.maildir" + +int +main (void) +{ + + FILE *fd; + int rc; + + fd = fopen(DATA,"w"); + if(fd == NULL) + exit(1); + +#if defined (_PATH_MAILDIR) + if ((rc = fprintf(fd ,"_PATH_MAILDIR:%s\n", _PATH_MAILDIR)) <0) + exit(1); +#elif defined (MAILDIR) + if ((rc = fprintf(fd ,"MAILDIR:%s\n", MAILDIR)) <0) + exit(1); +#elif defined (_PATH_MAIL) + if ((rc = fprintf(fd ,"_PATH_MAIL:%s\n", _PATH_MAIL)) <0) + exit(1); +#else + exit (2); +#endif + + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + + maildir_what=`awk -F: '{print $1}' conftest.maildir` + maildir=`awk -F: '{print $2}' conftest.maildir \ + | sed 's|/$||'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using: $maildir from $maildir_what" >&5 +printf "%s\n" "Using: $maildir from $maildir_what" >&6; } + if test "x$maildir_what" != "x_PATH_MAILDIR"; then + printf "%s\n" "#define MAIL_DIRECTORY \"$maildir\"" >>confdefs.h + + fi + +else $as_nop + + if test "X$ac_status" = "X2";then +# our test program didn't find it. Default to /var/spool/mail + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using: default value of /var/spool/mail" >&5 +printf "%s\n" "Using: default value of /var/spool/mail" >&6; } + printf "%s\n" "#define MAIL_DIRECTORY \"/var/spool/mail\"" >>confdefs.h + + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: *** not found ***" >&5 +printf "%s\n" "*** not found ***" >&6; } + fi + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi + + +fi + # maildir + +if test ! -z "$cross_compiling" && test "x$cross_compiling" = "xyes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Disabling /dev/ptmx test" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: Disabling /dev/ptmx test" >&2;} + disable_ptmx_check=yes +fi +if test -z "$no_dev_ptmx" ; then + if test "x$disable_ptmx_check" != "xyes" ; then + as_ac_File=`printf "%s\n" "ac_cv_file_"/dev/ptmx"" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for \"/dev/ptmx\"" >&5 +printf %s "checking for \"/dev/ptmx\"... " >&6; } +if eval test \${$as_ac_File+y} +then : + printf %s "(cached) " >&6 +else $as_nop + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r ""/dev/ptmx""; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" +fi +fi +eval ac_res=\$$as_ac_File + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes" +then : + + +printf "%s\n" "#define HAVE_DEV_PTMX 1" >>confdefs.h + + have_dev_ptmx=1 + + +fi + + fi +fi + +if test ! -z "$cross_compiling" && test "x$cross_compiling" != "xyes"; then + as_ac_File=`printf "%s\n" "ac_cv_file_"/dev/ptc"" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for \"/dev/ptc\"" >&5 +printf %s "checking for \"/dev/ptc\"... " >&6; } +if eval test \${$as_ac_File+y} +then : + printf %s "(cached) " >&6 +else $as_nop + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r ""/dev/ptc""; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" +fi +fi +eval ac_res=\$$as_ac_File + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes" +then : + + +printf "%s\n" "#define HAVE_DEV_PTS_AND_PTC 1" >>confdefs.h + + have_dev_ptc=1 + + +fi + +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Disabling /dev/ptc test" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: Disabling /dev/ptc test" >&2;} +fi + +# Options from here on. Some of these are preset by platform above + +# Check whether --with-mantype was given. +if test ${with_mantype+y} +then : + withval=$with_mantype; + case "$withval" in + man|cat|doc) + MANTYPE=$withval + ;; + *) + as_fn_error $? "invalid man type: $withval" "$LINENO" 5 + ;; + esac + + +fi + +if test -z "$MANTYPE"; then + if ${MANDOC} ${srcdir}/ssh.1 >/dev/null 2>&1; then + MANTYPE=doc + elif ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then + MANTYPE=doc + elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then + MANTYPE=man + else + MANTYPE=cat + fi +fi + +if test "$MANTYPE" = "doc"; then + mansubdir=man; +else + mansubdir=$MANTYPE; +fi + + +# Whether to disable shadow password support + +# Check whether --with-shadow was given. +if test ${with_shadow+y} +then : + withval=$with_shadow; + if test "x$withval" = "xno" ; then + printf "%s\n" "#define DISABLE_SHADOW 1" >>confdefs.h + + disable_shadow=yes + fi + + +fi + + +if test -z "$disable_shadow" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the systems has expire shadow information" >&5 +printf %s "checking if the systems has expire shadow information... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +struct spwd sp; + +int +main (void) +{ + sp.sp_expire = sp.sp_lstchg = sp.sp_inact = 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + sp_expire_available=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + + if test "x$sp_expire_available" = "xyes" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAS_SHADOW_EXPIRE 1" >>confdefs.h + + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi +fi + +# Use ip address instead of hostname in $DISPLAY +if test ! -z "$IPADDR_IN_DISPLAY" ; then + DISPLAY_HACK_MSG="yes" + +printf "%s\n" "#define IPADDR_IN_DISPLAY 1" >>confdefs.h + +else + DISPLAY_HACK_MSG="no" + +# Check whether --with-ipaddr-display was given. +if test ${with_ipaddr_display+y} +then : + withval=$with_ipaddr_display; + if test "x$withval" != "xno" ; then + printf "%s\n" "#define IPADDR_IN_DISPLAY 1" >>confdefs.h + + DISPLAY_HACK_MSG="yes" + fi + + +fi + +fi + +# check for /etc/default/login and use it if present. +# Check whether --enable-etc-default-login was given. +if test ${enable_etc_default_login+y} +then : + enableval=$enable_etc_default_login; if test "x$enableval" = "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: /etc/default/login handling disabled" >&5 +printf "%s\n" "$as_me: /etc/default/login handling disabled" >&6;} + etc_default_login=no + else + etc_default_login=yes + fi +else $as_nop + if test ! -z "$cross_compiling" && test "x$cross_compiling" = "xyes"; + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking /etc/default/login" >&5 +printf "%s\n" "$as_me: WARNING: cross compiling: not checking /etc/default/login" >&2;} + etc_default_login=no + else + etc_default_login=yes + fi + +fi + + +if test "x$etc_default_login" != "xno"; then + as_ac_File=`printf "%s\n" "ac_cv_file_"/etc/default/login"" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for \"/etc/default/login\"" >&5 +printf %s "checking for \"/etc/default/login\"... " >&6; } +if eval test \${$as_ac_File+y} +then : + printf %s "(cached) " >&6 +else $as_nop + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r ""/etc/default/login""; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" +fi +fi +eval ac_res=\$$as_ac_File + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes" +then : + external_path_file=/etc/default/login +fi + + if test "x$external_path_file" = "x/etc/default/login"; then + +printf "%s\n" "#define HAVE_ETC_DEFAULT_LOGIN 1" >>confdefs.h + + fi +fi + +if test $ac_cv_func_login_getcapbool = "yes" && \ + test $ac_cv_header_login_cap_h = "yes" ; then + external_path_file=/etc/login.conf +fi + +# Whether to mess with the default path +SERVER_PATH_MSG="(default)" + +# Check whether --with-default-path was given. +if test ${with_default_path+y} +then : + withval=$with_default_path; + if test "x$external_path_file" = "x/etc/login.conf" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +--with-default-path=PATH has no effect on this system. +Edit /etc/login.conf instead." >&5 +printf "%s\n" "$as_me: WARNING: +--with-default-path=PATH has no effect on this system. +Edit /etc/login.conf instead." >&2;} + elif test "x$withval" != "xno" ; then + if test ! -z "$external_path_file" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +--with-default-path=PATH will only be used if PATH is not defined in +$external_path_file ." >&5 +printf "%s\n" "$as_me: WARNING: +--with-default-path=PATH will only be used if PATH is not defined in +$external_path_file ." >&2;} + fi + user_path="$withval" + SERVER_PATH_MSG="$withval" + fi + +else $as_nop + if test "x$external_path_file" = "x/etc/login.conf" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Make sure the path to scp is in /etc/login.conf" >&5 +printf "%s\n" "$as_me: WARNING: Make sure the path to scp is in /etc/login.conf" >&2;} + else + if test ! -z "$external_path_file" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +If PATH is defined in $external_path_file, ensure the path to scp is included, +otherwise scp will not work." >&5 +printf "%s\n" "$as_me: WARNING: +If PATH is defined in $external_path_file, ensure the path to scp is included, +otherwise scp will not work." >&2;} + fi + if test "$cross_compiling" = yes +then : + user_path="/usr/bin:/bin:/usr/sbin:/sbin" + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* find out what STDPATH is */ +#include +#include +#ifdef HAVE_PATHS_H +# include +#endif +#ifndef _PATH_STDPATH +# ifdef _PATH_USERPATH /* Irix */ +# define _PATH_STDPATH _PATH_USERPATH +# else +# define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin" +# endif +#endif +#include +#include +#include +#define DATA "conftest.stdpath" + +int +main (void) +{ + + FILE *fd; + int rc; + + fd = fopen(DATA,"w"); + if(fd == NULL) + exit(1); + + if ((rc = fprintf(fd,"%s", _PATH_STDPATH)) < 0) + exit(1); + + exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + user_path=`cat conftest.stdpath` +else $as_nop + user_path="/usr/bin:/bin:/usr/sbin:/sbin" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +# make sure $bindir is in USER_PATH so scp will work + t_bindir="${bindir}" + while echo "${t_bindir}" | egrep '\$\{|NONE/' >/dev/null 2>&1; do + t_bindir=`eval echo ${t_bindir}` + case $t_bindir in + NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$prefix~"` ;; + esac + case $t_bindir in + NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$ac_default_prefix~"` ;; + esac + done + echo $user_path | grep ":$t_bindir" > /dev/null 2>&1 + if test $? -ne 0 ; then + echo $user_path | grep "^$t_bindir" > /dev/null 2>&1 + if test $? -ne 0 ; then + user_path=$user_path:$t_bindir + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Adding $t_bindir to USER_PATH so scp will work" >&5 +printf "%s\n" "Adding $t_bindir to USER_PATH so scp will work" >&6; } + fi + fi + fi + +fi + +if test "x$external_path_file" != "x/etc/login.conf" ; then + +printf "%s\n" "#define USER_PATH \"$user_path\"" >>confdefs.h + + +fi + +# Set superuser path separately to user path + +# Check whether --with-superuser-path was given. +if test ${with_superuser_path+y} +then : + withval=$with_superuser_path; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + +printf "%s\n" "#define SUPERUSER_PATH \"$withval\"" >>confdefs.h + + superuser_path=$withval + fi + + +fi + + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5 +printf %s "checking if we need to convert IPv4 in IPv6-mapped addresses... " >&6; } +IPV4_IN6_HACK_MSG="no" + +# Check whether --with-4in6 was given. +if test ${with_4in6+y} +then : + withval=$with_4in6; + if test "x$withval" != "xno" ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define IPV4_IN_IPV6 1" >>confdefs.h + + IPV4_IN6_HACK_MSG="yes" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + +else $as_nop + + if test "x$inet6_default_4in6" = "xyes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (default)" >&5 +printf "%s\n" "yes (default)" >&6; } + printf "%s\n" "#define IPV4_IN_IPV6 1" >>confdefs.h + + IPV4_IN6_HACK_MSG="yes" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5 +printf "%s\n" "no (default)" >&6; } + fi + + +fi + + +# Whether to enable BSD auth support +BSD_AUTH_MSG=no + +# Check whether --with-bsd-auth was given. +if test ${with_bsd_auth+y} +then : + withval=$with_bsd_auth; + if test "x$withval" != "xno" ; then + +printf "%s\n" "#define BSD_AUTH 1" >>confdefs.h + + BSD_AUTH_MSG=yes + fi + + +fi + + +# Where to place sshd.pid +piddir=/var/run +# make sure the directory exists +if test ! -d $piddir ; then + piddir=`eval echo ${sysconfdir}` + case $piddir in + NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;; + esac +fi + + +# Check whether --with-pid-dir was given. +if test ${with_pid_dir+y} +then : + withval=$with_pid_dir; + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + piddir=$withval + if test ! -d $piddir ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ** no $piddir directory on this system **" >&5 +printf "%s\n" "$as_me: WARNING: ** no $piddir directory on this system **" >&2;} + fi + fi + + +fi + + + +printf "%s\n" "#define _PATH_SSH_PIDDIR \"$piddir\"" >>confdefs.h + + + + +# Check whether --enable-fd-passing was given. +if test ${enable_fd_passing+y} +then : + enableval=$enable_fd_passing; + if test "x$enableval" = "xno" ; then + printf "%s\n" "#define DISABLE_FD_PASSING 1" >>confdefs.h + + fi + + +fi + + +# Check whether --enable-lastlog was given. +if test ${enable_lastlog+y} +then : + enableval=$enable_lastlog; + if test "x$enableval" = "xno" ; then + printf "%s\n" "#define DISABLE_LASTLOG 1" >>confdefs.h + + fi + + +fi + +# Check whether --enable-utmp was given. +if test ${enable_utmp+y} +then : + enableval=$enable_utmp; + if test "x$enableval" = "xno" ; then + printf "%s\n" "#define DISABLE_UTMP 1" >>confdefs.h + + fi + + +fi + +# Check whether --enable-utmpx was given. +if test ${enable_utmpx+y} +then : + enableval=$enable_utmpx; + if test "x$enableval" = "xno" ; then + +printf "%s\n" "#define DISABLE_UTMPX 1" >>confdefs.h + + fi + + +fi + +# Check whether --enable-wtmp was given. +if test ${enable_wtmp+y} +then : + enableval=$enable_wtmp; + if test "x$enableval" = "xno" ; then + printf "%s\n" "#define DISABLE_WTMP 1" >>confdefs.h + + fi + + +fi + +# Check whether --enable-wtmpx was given. +if test ${enable_wtmpx+y} +then : + enableval=$enable_wtmpx; + if test "x$enableval" = "xno" ; then + +printf "%s\n" "#define DISABLE_WTMPX 1" >>confdefs.h + + fi + + +fi + +# Check whether --enable-libutil was given. +if test ${enable_libutil+y} +then : + enableval=$enable_libutil; + if test "x$enableval" = "xno" ; then + printf "%s\n" "#define DISABLE_LOGIN 1" >>confdefs.h + + fi + + +fi + +# Check whether --enable-pututline was given. +if test ${enable_pututline+y} +then : + enableval=$enable_pututline; + if test "x$enableval" = "xno" ; then + +printf "%s\n" "#define DISABLE_PUTUTLINE 1" >>confdefs.h + + fi + + +fi + +# Check whether --enable-pututxline was given. +if test ${enable_pututxline+y} +then : + enableval=$enable_pututxline; + if test "x$enableval" = "xno" ; then + +printf "%s\n" "#define DISABLE_PUTUTXLINE 1" >>confdefs.h + + fi + + +fi + + +# Check whether --with-lastlog was given. +if test ${with_lastlog+y} +then : + withval=$with_lastlog; + if test "x$withval" = "xno" ; then + printf "%s\n" "#define DISABLE_LASTLOG 1" >>confdefs.h + + elif test -n "$withval" && test "x${withval}" != "xyes"; then + conf_lastlog_location=$withval + fi + + +fi + + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your system defines LASTLOG_FILE" >&5 +printf %s "checking if your system defines LASTLOG_FILE... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#ifdef HAVE_LASTLOG_H +# include +#endif +#ifdef HAVE_PATHS_H +# include +#endif +#ifdef HAVE_LOGIN_H +# include +#endif + +int +main (void) +{ + char *lastlog = LASTLOG_FILE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your system defines _PATH_LASTLOG" >&5 +printf %s "checking if your system defines _PATH_LASTLOG... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#ifdef HAVE_LASTLOG_H +# include +#endif +#ifdef HAVE_PATHS_H +# include +#endif + +int +main (void) +{ + char *lastlog = _PATH_LASTLOG; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + system_lastlog_path=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +if test -z "$conf_lastlog_location"; then + if test x"$system_lastlog_path" = x"no" ; then + for f in /var/log/lastlog /usr/adm/lastlog /var/adm/lastlog /etc/security/lastlog ; do + if (test -d "$f" || test -f "$f") ; then + conf_lastlog_location=$f + fi + done + if test -z "$conf_lastlog_location"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ** Cannot find lastlog **" >&5 +printf "%s\n" "$as_me: WARNING: ** Cannot find lastlog **" >&2;} + fi + fi +fi + +if test -n "$conf_lastlog_location"; then + +printf "%s\n" "#define CONF_LASTLOG_FILE \"$conf_lastlog_location\"" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your system defines UTMP_FILE" >&5 +printf %s "checking if your system defines UTMP_FILE... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#ifdef HAVE_PATHS_H +# include +#endif + +int +main (void) +{ + char *utmp = UTMP_FILE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + system_utmp_path=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +if test -z "$conf_utmp_location"; then + if test x"$system_utmp_path" = x"no" ; then + for f in /etc/utmp /usr/adm/utmp /var/run/utmp; do + if test -f $f ; then + conf_utmp_location=$f + fi + done + if test -z "$conf_utmp_location"; then + printf "%s\n" "#define DISABLE_UTMP 1" >>confdefs.h + + fi + fi +fi +if test -n "$conf_utmp_location"; then + +printf "%s\n" "#define CONF_UTMP_FILE \"$conf_utmp_location\"" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your system defines WTMP_FILE" >&5 +printf %s "checking if your system defines WTMP_FILE... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#ifdef HAVE_PATHS_H +# include +#endif + +int +main (void) +{ + char *wtmp = WTMP_FILE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + system_wtmp_path=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +if test -z "$conf_wtmp_location"; then + if test x"$system_wtmp_path" = x"no" ; then + for f in /usr/adm/wtmp /var/log/wtmp; do + if test -f $f ; then + conf_wtmp_location=$f + fi + done + if test -z "$conf_wtmp_location"; then + printf "%s\n" "#define DISABLE_WTMP 1" >>confdefs.h + + fi + fi +fi +if test -n "$conf_wtmp_location"; then + +printf "%s\n" "#define CONF_WTMP_FILE \"$conf_wtmp_location\"" >>confdefs.h + +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your system defines WTMPX_FILE" >&5 +printf %s "checking if your system defines WTMPX_FILE... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#ifdef HAVE_UTMPX_H +#include +#endif +#ifdef HAVE_PATHS_H +# include +#endif + +int +main (void) +{ + char *wtmpx = WTMPX_FILE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + system_wtmpx_path=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +if test -z "$conf_wtmpx_location"; then + if test x"$system_wtmpx_path" = x"no" ; then + printf "%s\n" "#define DISABLE_WTMPX 1" >>confdefs.h + + fi +else + +printf "%s\n" "#define CONF_WTMPX_FILE \"$conf_wtmpx_location\"" >>confdefs.h + +fi + + +if test ! -z "$blibpath" ; then + LDFLAGS="$LDFLAGS $blibflags$blibpath" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&5 +printf "%s\n" "$as_me: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&2;} +fi + +ac_fn_c_check_member "$LINENO" "struct lastlog" "ll_line" "ac_cv_member_struct_lastlog_ll_line" " +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_UTMP_H +#include +#endif +#ifdef HAVE_UTMPX_H +#include +#endif +#ifdef HAVE_LASTLOG_H +#include +#endif + +" +if test "x$ac_cv_member_struct_lastlog_ll_line" = xyes +then : + +else $as_nop + + if test x$SKIP_DISABLE_LASTLOG_DEFINE != "xyes" ; then + printf "%s\n" "#define DISABLE_LASTLOG 1" >>confdefs.h + + fi + +fi + + +ac_fn_c_check_member "$LINENO" "struct utmp" "ut_line" "ac_cv_member_struct_utmp_ut_line" " +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_UTMP_H +#include +#endif +#ifdef HAVE_UTMPX_H +#include +#endif +#ifdef HAVE_LASTLOG_H +#include +#endif + +" +if test "x$ac_cv_member_struct_utmp_ut_line" = xyes +then : + +else $as_nop + + printf "%s\n" "#define DISABLE_UTMP 1" >>confdefs.h + + printf "%s\n" "#define DISABLE_WTMP 1" >>confdefs.h + + +fi + + +CFLAGS="$CFLAGS $werror_flags" + +if test "x$ac_cv_func_getaddrinfo" != "xyes" ; then + TEST_SSH_IPV6=no +else + TEST_SSH_IPV6=yes +fi +ac_fn_check_decl "$LINENO" "BROKEN_GETADDRINFO" "ac_cv_have_decl_BROKEN_GETADDRINFO" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_BROKEN_GETADDRINFO" = xyes +then : + TEST_SSH_IPV6=no +fi +TEST_SSH_IPV6=$TEST_SSH_IPV6 + +TEST_SSH_UTF8=$TEST_SSH_UTF8 + +TEST_MALLOC_OPTIONS=$TEST_MALLOC_OPTIONS + +UNSUPPORTED_ALGORITHMS=$unsupported_algorithms + +DEPEND=$(cat $srcdir/.depend) + + +# Binaries for interop tests. +# Extract the first word of "plink", so it can be a program name with args. +set dummy plink; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PLINK+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PLINK in + [\\/]* | ?:[\\/]*) + ac_cv_path_PLINK="$PLINK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PLINK="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PLINK=$ac_cv_path_PLINK +if test -n "$PLINK"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PLINK" >&5 +printf "%s\n" "$PLINK" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "puttygen", so it can be a program name with args. +set dummy puttygen; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PUTTYGEN+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PUTTYGEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_PUTTYGEN="$PUTTYGEN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PUTTYGEN="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PUTTYGEN=$ac_cv_path_PUTTYGEN +if test -n "$PUTTYGEN"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PUTTYGEN" >&5 +printf "%s\n" "$PUTTYGEN" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "conch", so it can be a program name with args. +set dummy conch; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_CONCH+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $CONCH in + [\\/]* | ?:[\\/]*) + ac_cv_path_CONCH="$CONCH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_CONCH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +CONCH=$ac_cv_path_CONCH +if test -n "$CONCH"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CONCH" >&5 +printf "%s\n" "$CONCH" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "dropbear", so it can be a program name with args. +set dummy dropbear; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DROPBEAR+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $DROPBEAR in + [\\/]* | ?:[\\/]*) + ac_cv_path_DROPBEAR="$DROPBEAR" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DROPBEAR="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DROPBEAR=$ac_cv_path_DROPBEAR +if test -n "$DROPBEAR"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DROPBEAR" >&5 +printf "%s\n" "$DROPBEAR" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "dbclient", so it can be a program name with args. +set dummy dbclient; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DBCLIENT+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $DBCLIENT in + [\\/]* | ?:[\\/]*) + ac_cv_path_DBCLIENT="$DBCLIENT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DBCLIENT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DBCLIENT=$ac_cv_path_DBCLIENT +if test -n "$DBCLIENT"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DBCLIENT" >&5 +printf "%s\n" "$DBCLIENT" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "dropbearkey", so it can be a program name with args. +set dummy dropbearkey; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DROPBEARKEY+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $DROPBEARKEY in + [\\/]* | ?:[\\/]*) + ac_cv_path_DROPBEARKEY="$DROPBEARKEY" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DROPBEARKEY="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DROPBEARKEY=$ac_cv_path_DROPBEARKEY +if test -n "$DROPBEARKEY"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DROPBEARKEY" >&5 +printf "%s\n" "$DROPBEARKEY" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "dropbearconvert", so it can be a program name with args. +set dummy dropbearconvert; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DROPBEARCONVERT+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $DROPBEARCONVERT in + [\\/]* | ?:[\\/]*) + ac_cv_path_DROPBEARCONVERT="$DROPBEARCONVERT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DROPBEARCONVERT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DROPBEARCONVERT=$ac_cv_path_DROPBEARCONVERT +if test -n "$DROPBEARCONVERT"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DROPBEARCONVERT" >&5 +printf "%s\n" "$DROPBEARCONVERT" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +# Extract the first word of "tmux", so it can be a program name with args. +set dummy tmux; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_TMUX+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $TMUX in + [\\/]* | ?:[\\/]*) + ac_cv_path_TMUX="$TMUX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_TMUX="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +TMUX=$ac_cv_path_TMUX +if test -n "$TMUX"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TMUX" >&5 +printf "%s\n" "$TMUX" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + +CFLAGS="${CFLAGS} ${CFLAGS_AFTER}" +LDFLAGS="${LDFLAGS} ${LDFLAGS_AFTER}" + +# Make a copy of CFLAGS/LDFLAGS without PIE options. +LDFLAGS_NOPIE=`echo "$LDFLAGS" | sed 's/^-pie //;s/ -pie//g'` +CFLAGS_NOPIE=`echo "$CFLAGS" | sed 's/^-fPIE //;s/ -fPIE//g'` + + + + + +ac_config_files="$ac_config_files Makefile buildpkg.sh opensshd.init openssh.xml openbsd-compat/Makefile openbsd-compat/regress/Makefile survey.sh" + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else $as_nop + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. +as_nl=' +' +export as_nl +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + +# The user is always right. +if ${PATH_SEPARATOR+false} :; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + printf "%s\n" "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else $as_nop + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else $as_nop + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by OpenSSH $as_me Portable, which was +generated by GNU Autoconf 2.71. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Report bugs to ." + +_ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config='$ac_cs_config_escaped' +ac_cs_version="\\ +OpenSSH config.status Portable +configured by $0, generated by GNU Autoconf 2.71, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2021 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + printf "%s\n" "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + printf "%s\n" "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + printf "%s\n" "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + printf "%s\n" "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "buildpkg.sh") CONFIG_FILES="$CONFIG_FILES buildpkg.sh" ;; + "opensshd.init") CONFIG_FILES="$CONFIG_FILES opensshd.init" ;; + "openssh.xml") CONFIG_FILES="$CONFIG_FILES openssh.xml" ;; + "openbsd-compat/Makefile") CONFIG_FILES="$CONFIG_FILES openbsd-compat/Makefile" ;; + "openbsd-compat/regress/Makefile") CONFIG_FILES="$CONFIG_FILES openbsd-compat/regress/Makefile" ;; + "survey.sh") CONFIG_FILES="$CONFIG_FILES survey.sh" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`printf "%s\n" "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + printf "%s\n" "/* $configure_input */" >&1 \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + printf "%s\n" "/* $configure_input */" >&1 \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi + ;; + + + esac + +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + + +# Print summary of options + +# Someone please show me a better way :) +A=`eval echo ${prefix}` ; A=`eval echo ${A}` +B=`eval echo ${bindir}` ; B=`eval echo ${B}` +C=`eval echo ${sbindir}` ; C=`eval echo ${C}` +D=`eval echo ${sysconfdir}` ; D=`eval echo ${D}` +E=`eval echo ${libexecdir}/ssh-askpass` ; E=`eval echo ${E}` +F=`eval echo ${mandir}/${mansubdir}X` ; F=`eval echo ${F}` +G=`eval echo ${piddir}` ; G=`eval echo ${G}` +H=`eval echo ${PRIVSEP_PATH}` ; H=`eval echo ${H}` +I=`eval echo ${user_path}` ; I=`eval echo ${I}` +J=`eval echo ${superuser_path}` ; J=`eval echo ${J}` + +echo "" +echo "OpenSSH has been configured with the following options:" +echo " User binaries: $B" +echo " System binaries: $C" +echo " Configuration files: $D" +echo " Askpass program: $E" +echo " Manual pages: $F" +echo " PID file: $G" +echo " Privilege separation chroot path: $H" +if test "x$external_path_file" = "x/etc/login.conf" ; then +echo " At runtime, sshd will use the path defined in $external_path_file" +echo " Make sure the path to scp is present, otherwise scp will not work" +else +echo " sshd default user PATH: $I" + if test ! -z "$external_path_file"; then +echo " (If PATH is set in $external_path_file it will be used instead. If" +echo " used, ensure the path to scp is present, otherwise scp will not work.)" + fi +fi +if test ! -z "$superuser_path" ; then +echo " sshd superuser user PATH: $J" +fi +echo " Manpage format: $MANTYPE" +echo " PAM support: $PAM_MSG" +echo " OSF SIA support: $SIA_MSG" +echo " KerberosV support: $KRB5_MSG" +echo " SELinux support: $SELINUX_MSG" +echo " libedit support: $LIBEDIT_MSG" +echo " libldns support: $LDNS_MSG" +echo " Solaris process contract support: $SPC_MSG" +echo " Solaris project support: $SP_MSG" +echo " Solaris privilege support: $SPP_MSG" +echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" +echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" +echo " BSD Auth support: $BSD_AUTH_MSG" +echo " Random number source: $RAND_MSG" +echo " Privsep sandbox style: $SANDBOX_STYLE" +echo " PKCS#11 support: $enable_pkcs11" +echo " U2F/FIDO support: $enable_sk" + +echo "" + +echo " Host: ${host}" +echo " Compiler: ${CC}" +echo " Compiler flags: ${CFLAGS}" +echo "Preprocessor flags: ${CPPFLAGS}" +echo " Linker flags: ${LDFLAGS}" +echo " Libraries: ${LIBS}" +if test ! -z "${CHANNELLIBS}"; then +echo " +for channels: ${CHANNELLIBS}" +fi +if test ! -z "${LIBFIDO2}"; then +echo " +for FIDO2: ${LIBFIDO2}" +fi +if test ! -z "${SSHDLIBS}"; then +echo " +for sshd: ${SSHDLIBS}" +fi + +echo "" + +if test "x$MAKE_PACKAGE_SUPPORTED" = "xyes" ; then + echo "SVR4 style packages are supported with \"make package\"" + echo "" +fi + +if test "x$PAM_MSG" = "xyes" ; then + echo "PAM is enabled. You may need to install a PAM control file " + echo "for sshd, otherwise password authentication may fail. " + echo "Example PAM control files can be found in the contrib/ " + echo "subdirectory" + echo "" +fi + +if test ! -z "$NO_PEERCHECK" ; then + echo "WARNING: the operating system that you are using does not" + echo "appear to support getpeereid(), getpeerucred() or the" + echo "SO_PEERCRED getsockopt() option. These facilities are used to" + echo "enforce security checks to prevent unauthorised connections to" + echo "ssh-agent. Their absence increases the risk that a malicious" + echo "user can connect to your agent." + echo "" +fi + +if test "$AUDIT_MODULE" = "bsm" ; then + echo "WARNING: BSM audit support is currently considered EXPERIMENTAL." + echo "See the Solaris section in README.platform for details." +fi diff --git a/configure.ac b/configure.ac index 2523b576710a..5b39c50f15e5 100644 --- a/configure.ac +++ b/configure.ac @@ -3146,8 +3146,9 @@ if test "x$openssl" = "xyes" ; then 100*|10100*) # 1.0.x, 1.1.0x AC_MSG_ERROR([OpenSSL >= 1.1.1 required (have "$ssl_showver")]) ;; - 101*) ;; # 1.1.x - 200*) # LibreSSL + 101*) openssl_impl="openssl" # 1.1.x + ;; + 200*) openssl_impl="libressl" lver=`echo "$sslver" | sed 's/.*libressl-//'` case "$lver" in 2*|300*|301*|302*|303*|304*|306*) # 2.x, 3.0.0 @@ -3156,7 +3157,7 @@ if test "x$openssl" = "xyes" ; then *) ;; # Assume all other versions are good. esac ;; - 30*|40*) + 30*|40*) openssl_impl="openssl" # OpenSSL 3 & 4; we use the 1.1x API # https://openssl.org/policies/general/versioning-policy.html CPPFLAGS="$CPPFLAGS -DOPENSSL_API_COMPAT=0x10100000L" @@ -3245,6 +3246,18 @@ if test "x$openssl" = "xyes" ; then ] ) + AC_CHECK_DECL([OPENSSL_IS_AWSLC], + [openssl_impl="aws-lc"], [], + [#include ] + ) + AC_CHECK_DECL([OPENSSL_IS_BORINGSSL], + [openssl_impl="boringssl"], [], + [#include ] + ) + + AC_MSG_CHECKING([OpenSSL implementation]) + AC_MSG_RESULT([$openssl_impl]) + AC_CHECK_FUNCS([ \ BN_is_prime_ex \ DES_crypt \ @@ -3345,7 +3358,7 @@ if test "x$openssl" = "xyes" ; then AC_CHECK_FUNCS([EVP_sha256 EVP_sha384 EVP_sha512 EVP_chacha20]) # Check complete ECC support in OpenSSL - AC_MSG_CHECKING([whether OpenSSL has NID_X9_62_prime256v1]) + AC_MSG_CHECKING([whether OpenSSL has ECC support]) AC_LINK_IFELSE( [AC_LANG_PROGRAM([[ #include @@ -3356,102 +3369,15 @@ if test "x$openssl" = "xyes" ; then #include ]], [[ EC_KEY *e = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); + EC_KEY *f = EC_KEY_new_by_curve_name(NID_secp384r1); + EC_KEY *g = EC_KEY_new_by_curve_name(NID_secp521r1); const EVP_MD *m = EVP_sha256(); /* We need this too */ ]])], - [ AC_MSG_RESULT([yes]) - enable_nistp256=1 ], - [ AC_MSG_RESULT([no]) ] - ) - - AC_MSG_CHECKING([whether OpenSSL has NID_secp384r1]) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ - #include - #include - #include - #include - #include - #include - ]], [[ - EC_KEY *e = EC_KEY_new_by_curve_name(NID_secp384r1); - const EVP_MD *m = EVP_sha384(); /* We need this too */ - ]])], - [ AC_MSG_RESULT([yes]) - enable_nistp384=1 ], - [ AC_MSG_RESULT([no]) ] - ) - - AC_MSG_CHECKING([whether OpenSSL has NID_secp521r1]) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ - #include - #include - #include - #include - #include - #include - ]], [[ - EC_KEY *e = EC_KEY_new_by_curve_name(NID_secp521r1); - const EVP_MD *m = EVP_sha512(); /* We need this too */ - ]])], - [ AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([if OpenSSL's NID_secp521r1 is functional]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[ - #include - #include - #include - #include - #include - #include - #include - ]],[[ - EC_KEY *e = EC_KEY_new_by_curve_name(NID_secp521r1); - const EVP_MD *m = EVP_sha512(); /* We need this too */ - exit(e == NULL || m == NULL); - ]])], - [ AC_MSG_RESULT([yes]) - enable_nistp521=1 ], - [ AC_MSG_RESULT([no]) ], - [ AC_MSG_WARN([cross-compiling: assuming yes]) - enable_nistp521=1 ] - )], - AC_MSG_RESULT([no]) + [ AC_MSG_RESULT([yes]) ], + [ AC_MSG_ERROR([libcrypto does not have required ECC support]) ] ) - - if test x$enable_nistp256 = x1 || test x$enable_nistp384 = x1 || \ - test x$enable_nistp521 = x1; then - AC_DEFINE(OPENSSL_HAS_ECC, [1], [OpenSSL has ECC]) - AC_CHECK_FUNCS([EC_KEY_METHOD_new]) - openssl_ecc=yes - else - openssl_ecc=no - fi - if test x$enable_nistp256 = x1; then - AC_DEFINE([OPENSSL_HAS_NISTP256], [1], - [libcrypto has NID_X9_62_prime256v1]) - else - unsupported_algorithms="$unsupported_algorithms \ - ecdsa-sha2-nistp256 \ - ecdh-sha2-nistp256 \ - ecdsa-sha2-nistp256-cert-v01@openssh.com" - fi - if test x$enable_nistp384 = x1; then - AC_DEFINE([OPENSSL_HAS_NISTP384], [1], [libcrypto has NID_secp384r1]) - else - unsupported_algorithms="$unsupported_algorithms \ - ecdsa-sha2-nistp384 \ - ecdh-sha2-nistp384 \ - ecdsa-sha2-nistp384-cert-v01@openssh.com" - fi - if test x$enable_nistp521 = x1; then - AC_DEFINE([OPENSSL_HAS_NISTP521], [1], [libcrypto has NID_secp521r1]) - else - unsupported_algorithms="$unsupported_algorithms \ - ecdh-sha2-nistp521 \ - ecdsa-sha2-nistp521 \ - ecdsa-sha2-nistp521-cert-v01@openssh.com" - fi + # Check for EC_KEY_METHOD support for ECDSA PKCS#11 + AC_CHECK_FUNCS([EC_KEY_METHOD_new]) # Check libcrypto ED25519 support AC_CHECK_FUNCS([EVP_PKEY_get_raw_public_key]) @@ -3480,17 +3406,30 @@ if test "x$openssl" = "xyes" ; then AC_MSG_RESULT([no]) ] ) + + case "$openssl_impl" in + aws-lc|boringssl) + # Brainpool does not work with AWC-LS or BoringSSL. + unsupported_algorithms="$unsupported_algorithms mlkem768brainpoolp256r1-sha256" + ;; + *) + AC_CHECK_DECL([NID_brainpoolP256r1], + [AC_DEFINE([USE_BRAINPOOLP256R1], [1], [Enable brainpool])], + [], + [[#include ]] + ) + ;; + esac + fi # PKCS11/U2F depend on OpenSSL and dlopen(). enable_pkcs11=yes enable_sk=yes -AC_CHECK_DECL([OPENSSL_IS_AWSLC], - [enable_pkcs11="disabled; PKCS#11 not supported with AWS-LC"], - [], - [#include ] -) +if test "x$openssl_impl" = "xaws-lc"; then + enable_pkcs11="disabled; PKCS#11 not supported with AWS-LC" +fi if test "x$ac_cv_func_dlopen" != "xyes" ; then enable_pkcs11="disabled; missing dlopen(3)" enable_sk="disabled; missing dlopen(3)" diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index a1440b5a17b3..f9693788a40f 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%global ver 10.4p1 +%global ver 10.5p1 %global rel 1%{?dist} # OpenSSH privilege separation requires a user & group ID diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index a7700860f3f6..174c7851c242 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -13,7 +13,7 @@ Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation Name: openssh -Version: 10.4p1 +Version: 10.5p1 URL: https://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz diff --git a/crypto_api.h b/crypto_api.h index 9095d8292d2c..f8441ed6f5eb 100644 --- a/crypto_api.h +++ b/crypto_api.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto_api.h,v 1.11 2026/06/14 03:59:34 djm Exp $ */ +/* $OpenBSD: crypto_api.h,v 1.12 2026/07/16 04:12:50 djm Exp $ */ /* * Assembled from generated headers and source files by Markus Friedl. @@ -73,8 +73,6 @@ int crypto_sign_ed25519_keypair_from_seed(unsigned char *, unsigned char *, #define crypto_kem_sntrup761_SECRETKEYBYTES 1763 #define crypto_kem_sntrup761_CIPHERTEXTBYTES 1039 #define crypto_kem_sntrup761_BYTES 32 -#define crypto_kem_mlkem768_ENCSEEDBYTES 32 -#define crypto_kem_mlkem768_KEYPAIRSEEDBYTES 64 int crypto_kem_sntrup761_enc(unsigned char *cstr, unsigned char *k, const unsigned char *pk); @@ -87,6 +85,8 @@ int crypto_kem_sntrup761_keypair(unsigned char *pk, unsigned char *sk); #define crypto_kem_mlkem768_SECRETKEYBYTES 2400 #define crypto_kem_mlkem768_CIPHERTEXTBYTES 1088 #define crypto_kem_mlkem768_BYTES 32 +#define crypto_kem_mlkem768_ENCSEEDBYTES 32 +#define crypto_kem_mlkem768_KEYPAIRSEEDBYTES 64 /* Aliases for MLKEM768 */ #define MLKEM768_PUBLICKEYBYTES crypto_kem_mlkem768_PUBLICKEYBYTES diff --git a/fixalgorithms b/fixalgorithms index 115dce81c71e..d445e5791a71 100755 --- a/fixalgorithms +++ b/fixalgorithms @@ -1,7 +1,7 @@ #!/bin/sh # -# fixciphers - remove unsupported ciphers from man pages. -# Usage: fixpaths /path/to/sed cipher1 [cipher2] outfile +# fixalgorithms - remove unsupported ciphers from man pages. +# Usage: fixalgorithms /path/to/sed cipher1 [cipher2] outfile # # Author: Darren Tucker (dtucker at zip com.au). Placed in the public domain. diff --git a/hpnssh-add.1 b/hpnssh-add.1 index f727d098e859..788962940eab 100644 --- a/hpnssh-add.1 +++ b/hpnssh-add.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-add.1,v 1.89 2026/03/05 05:44:15 djm Exp $ +.\" $OpenBSD: ssh-add.1,v 1.90 2026/07/11 11:15:03 naddy Exp $ .\" .\" Author: Tatu Ylonen .\" Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,7 +35,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: March 5 2026 $ +.Dd $Mdocdate: July 11 2026 $ .Dt HPNSSH-ADD 1 .Os .Sh NAME @@ -69,9 +69,10 @@ When run without arguments, it adds the files .Pa ~/.ssh/id_rsa , .Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa_sk , -.Pa ~/.ssh/id_ed25519 +.Pa ~/.ssh/id_ed25519 , +.Pa ~/.ssh/id_ed25519_sk and -.Pa ~/.ssh/id_ed25519_sk . +.Pa ~/.ssh/id_mldsa44_ed25519 . After loading a private key, .Nm will try to load corresponding certificate information from the @@ -333,9 +334,11 @@ the built-in USB HID support. .It Pa ~/.ssh/id_ecdsa_sk .It Pa ~/.ssh/id_ed25519 .It Pa ~/.ssh/id_ed25519_sk +.It Pa ~/.ssh/id_mldsa44_ed25519 .It Pa ~/.ssh/id_rsa Contains the ECDSA, authenticator-hosted ECDSA, Ed25519, -authenticator-hosted Ed25519 or RSA authentication identity of the user. +authenticator-hosted Ed25519, MLDSA44-ED25519 +or RSA authentication identity of the user. .El .Pp Identity files should not be readable by anyone but the user. diff --git a/hpnssh-keygen.1 b/hpnssh-keygen.1 index 33d1dd100c3c..32ffda4c6f15 100644 --- a/hpnssh-keygen.1 +++ b/hpnssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.238 2026/07/01 01:14:39 djm Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.240 2026/08/07 05:49:53 djm Exp $ .\" .\" Author: Tatu Ylonen .\" Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,7 +35,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 1 2026 $ +.Dd $Mdocdate: August 7 2026 $ .Dt HPNSSH-KEYGEN 1 .Os .Sh NAME @@ -213,7 +213,7 @@ key in .Pa ~/.ssh/id_ecdsa_sk , .Pa ~/.ssh/id_ed25519 , .Pa ~/.ssh/id_ed25519_sk , -.Pa ~/.ssh/id_mldsa44-ed25519 +.Pa ~/.ssh/id_mldsa44_ed25519 or .Pa ~/.ssh/id_rsa . Additionally, the system administrator may use this to generate host keys, @@ -496,6 +496,11 @@ When generating FIDO authenticator-backed keys, the options listed in the .Sx FIDO AUTHENTICATOR section may be specified. .Pp +When changing the passphrase for an existing key, the options listed in the +documentation for the +.Fl p +flag may be used. +.Pp When performing signature-related options using the .Fl Y flag, the following options are accepted: @@ -546,6 +551,32 @@ creating a new private key. The program will prompt for the file containing the private key, for the old passphrase, and twice for the new passphrase. +.Pp +Updating the passphrase will cause encrypted keys to be reencrypted, +allowing the cipher and/or number of KDF rounds (the +.Fl Z +and +.Fl a +options respectively) to be changed. +.Pp +This option may also be used to set or clear FIDO related options via the +.Fl O +flag. +The following FIDO options may be modified: +.Pp +.Bl -tag -width Ds -compact +.It Cm touch-required +.It Cm no-touch-required +Add or remove the requirement that signatures made using this key include +demonstration of user presence (e.g. by having the user touch the +authenticator). +.Pp +.It Cm verify-required +.It Cm no-verify-required +Add or remove the requirement for signatures made using this key to first +verify the user identity, e.g. by PIN or on-token biometrics. +.El +.Pp .It Fl Q Test whether keys have been revoked in a KRL. If the @@ -1305,7 +1336,7 @@ the built-in USB HID support. .It Pa ~/.ssh/id_ecdsa_sk .It Pa ~/.ssh/id_ed25519 .It Pa ~/.ssh/id_ed25519_sk -.It Pa ~/.ssh/id_mldsa44-ed25519 +.It Pa ~/.ssh/id_mldsa44_ed25519 .It Pa ~/.ssh/id_rsa Contains the ECDSA, authenticator-hosted ECDSA, Ed25519, authenticator-hosted Ed25519 or RSA authentication identity of the user. @@ -1323,7 +1354,7 @@ will read this file when a login attempt is made. .It Pa ~/.ssh/id_ecdsa_sk.pub .It Pa ~/.ssh/id_ed25519.pub .It Pa ~/.ssh/id_ed25519_sk.pub -.It Pa ~/.ssh/id_mldsa44-ed25519.pub +.It Pa ~/.ssh/id_mldsa44_ed25519.pub .It Pa ~/.ssh/id_rsa.pub Contains the ECDSA, authenticator-hosted ECDSA, Ed25519, authenticator-hosted Ed25519 or RSA public key for authentication. diff --git a/hpnssh-keysign.8 b/hpnssh-keysign.8 index 25fece63b725..450386ba839a 100644 --- a/hpnssh-keysign.8 +++ b/hpnssh-keysign.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keysign.8,v 1.18 2024/06/17 08:30:29 djm Exp $ +.\" $OpenBSD: ssh-keysign.8,v 1.19 2026/07/10 17:21:19 naddy Exp $ .\" .\" Copyright (c) 2002 Markus Friedl. All rights reserved. .\" @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 17 2024 $ +.Dd $Mdocdate: July 10 2026 $ .Dt HPNSSH-KEYSIGN 8 .Os .Sh NAME @@ -63,6 +63,7 @@ is enabled. .Pp .It Pa /etc/hpnssh/ssh_host_ecdsa_key .It Pa /etc/hpnssh/ssh_host_ed25519_key +.It Pa /etc/hpnssh/ssh_host_mldsa44_ed25519_key .It Pa /etc/hpnssh/ssh_host_rsa_key These files contain the private parts of the host keys used to generate the digital signature. @@ -74,6 +75,7 @@ must be set-uid root if host-based authentication is used. .Pp .It Pa /etc/hpnssh/ssh_host_ecdsa_key-cert.pub .It Pa /etc/hpnssh/ssh_host_ed25519_key-cert.pub +.It Pa /etc/hpnssh/ssh_host_mldsa44_ed25519_key-cert.pub .It Pa /etc/hpnssh/ssh_host_rsa_key-cert.pub If these files exist, they are assumed to contain public certificate information corresponding with the private keys above. diff --git a/hpnssh.1 b/hpnssh.1 index e972bdec3887..b30639d7a79b 100644 --- a/hpnssh.1 +++ b/hpnssh.1 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.449 2026/07/01 00:04:46 djm Exp $ -.Dd $Mdocdate: July 1 2026 $ +.\" $OpenBSD: ssh.1,v 1.454 2026/08/04 22:47:07 naddy Exp $ +.Dd $Mdocdate: August 4 2026 $ .Dt HPNSSH 1 .Os .Sh NAME @@ -42,7 +42,7 @@ .Nd HPN/OpenSSH remote login client .Sh SYNOPSIS .Nm hpnssh -.Op Fl 46AaCfGgKkMNnqsTtVvXxYy +.Op Fl 46AaCfGgKkMNnqsTtVvXxYyZ .Op Fl B Ar bind_interface .Op Fl b Ar bind_address .Op Fl c Ar cipher_spec @@ -312,9 +312,10 @@ The default is .Pa ~/.ssh/id_rsa , .Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa_sk , -.Pa ~/.ssh/id_ed25519 +.Pa ~/.ssh/id_ed25519 , +.Pa ~/.ssh/id_ed25519_sk and -.Pa ~/.ssh/id_ed25519_sk . +.Pa ~/.ssh/id_mldsa44_ed25519 . Identity files may also be specified on a per-host basis in the configuration file. It is possible to have multiple @@ -513,128 +514,9 @@ Valid commands are: Can be used to give options in the format used in the configuration file. This is useful for specifying options for which there is no separate command-line flag. -For full details of the options listed below, and their possible values, see +For full details of the options, and their values, see .Xr hpnssh_config 5 . .Pp -.Bl -tag -width Ds -offset indent -compact -.It AddKeysToAgent -.It AddressFamily -.It BatchMode -.It BindAddress -.It BindInterface -.It CASignatureAlgorithms -.It CanonicalDomains -.It CanonicalizeFallbackLocal -.It CanonicalizeHostname -.It CanonicalizeMaxDots -.It CanonicalizePermittedCNAMEs -.It CertificateFile -.It ChannelTimeout -.It CheckHostIP -.It Ciphers -.It ClearAllForwardings -.It Compression -.It ConnectTimeout -.It ConnectionAttempts -.It ControlMaster -.It ControlPath -.It ControlPersist -.It DisableMTAES* -.It DynamicForward -.It EnableEscapeCommandline -.It EnableSSHKeysign -.It EscapeChar -.It ExitOnForwardFailure -.It FallbackPort -.It FingerprintHash -.It ForkAfterAuthentication -.It ForwardAgent -.It ForwardX11 -.It ForwardX11Timeout -.It ForwardX11Trusted -.It GSSAPIAuthentication -.It GSSAPIDelegateCredentials -.It GatewayPorts -.It GlobalKnownHostsFile -.It HappyEyes -.It HappyDelay -.It HashKnownHosts -.It HostKeyAlgorithms -.It HostKeyAlias -.It HostbasedAcceptedAlgorithms -.It HostbasedAuthentication -.It Hostname -.It HPNDisabled* -.It IPQoS -.It IdentitiesOnly -.It IdentityAgent -.It IdentityFile -.It IgnoreUnknown -.It KbdInteractiveAuthentication -.It KbdInteractiveDevices -.It KexAlgorithms -.It KnownHostsCommand -.It LocalCommand -.It LocalForward -.It LogLevel -.It LogVerbose -.It MACs -.It Metrics -.It MetricsInterval -.It MetricsPath -.It NoHostAuthenticationForLocalhost -.It NoneCipherEnabled* -.It NoneEnabled* -.It NoneMacEnabled* -.It NumberOfPasswordPrompts -.It ObscureKeystrokeTiming -.It PKCS11Provider -.It PasswordAuthentication -.It PermitLocalCommand -.It PermitRemoteOpen -.It Port -.It PreferredAuthentications -.It ProxyCommand -.It ProxyJump -.It ProxyUseFdpass -.It PubkeyAcceptedAlgorithms -.It PubkeyAuthentication -.It RefuseConnection -.It RekeyLimit -.It RemoteCommand -.It RemoteForward -.It RequestTTY -.It RequiredRSASize -.It RevokedHostKeys -.It SecurityKeyProvider -.It SendEnv -.It ServerAliveCountMax -.It ServerAliveInterval -.It SessionType -.It SetEnv -.It StdinNull -.It StreamLocalBindMask -.It StreamLocalBindUnlink -.It StrictHostKeyChecking -.It SyslogFacility -.It TCPKeepAlive -.It TcpRcvBufPoll* -.It Tag -.It Tunnel -.It TunnelDevice -.It UpdateHostKeys -.It UseMPTCP -.It User -.It UserKnownHostsFile -.It VerifyHostKeyDNS -.It VersionAddendum -.It VisualHostKey -.It WarnWeakCrypto -.It XAuthLocation -.Pp -.It * Hpnssh specific configuration option. -.El -.Pp .It Fl P Ar tag Specify a tag name that may be used to select configuration in .Xr ssh_config 5 . @@ -645,6 +527,7 @@ and keywords in .Xr ssh_config 5 for more information. +.Pp .It Fl p Ar port Port to connect to on the remote host. This can be specified on a @@ -913,6 +796,10 @@ Send log information using the .Xr syslog 3 system module. By default this information is sent to stderr. +.Pp +.It Fl Z +List the public keys that would be attempted for authentication to the specified +destination in preferred order and exit. .El .Pp .Nm @@ -1010,6 +897,8 @@ This stores the private key in (Ed25519), .Pa ~/.ssh/id_ed25519_sk (authenticator-hosted Ed25519), +.Pa ~/.ssh/id_mldsa44_ed25519 +(MLDSA44-ED25519), or .Pa ~/.ssh/id_rsa (RSA) @@ -1022,6 +911,8 @@ and stores the public key in (Ed25519), .Pa ~/.ssh/id_ed25519_sk.pub (authenticator-hosted Ed25519), +.Pa ~/.ssh/id_mldsa44_ed25519.pub +(MLDSA44-ED25519), or .Pa ~/.ssh/id_rsa.pub (RSA) @@ -1621,6 +1512,7 @@ above. .It Pa ~/.ssh/id_ecdsa_sk .It Pa ~/.ssh/id_ed25519 .It Pa ~/.ssh/id_ed25519_sk +.It Pa ~/.ssh/id_mldsa44_ed25519 .It Pa ~/.ssh/id_rsa Contains the private key for authentication. These files @@ -1636,6 +1528,7 @@ sensitive part of this file using AES-128. .It Pa ~/.ssh/id_ecdsa_sk.pub .It Pa ~/.ssh/id_ed25519.pub .It Pa ~/.ssh/id_ed25519_sk.pub +.It Pa ~/.ssh/id_mldsa44_ed25519.pub .It Pa ~/.ssh/id_rsa.pub Contains the public key for authentication. These files are not @@ -1674,6 +1567,7 @@ The file format and configuration options are described in .Pp .It Pa /etc/hpnssh/ssh_host_ecdsa_key .It Pa /etc/hpnssh/ssh_host_ed25519_key +.It Pa /etc/hpnssh/ssh_host_mldsa44_ed25519_key .It Pa /etc/hpnssh/ssh_host_rsa_key These files contain the private parts of the host keys and are used for host-based authentication. diff --git a/hpnssh_config.5 b/hpnssh_config.5 index 3c2b062fbd6b..3b89cb382fa6 100644 --- a/hpnssh_config.5 +++ b/hpnssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.426 2026/07/01 00:52:31 djm Exp $ -.Dd $Mdocdate: July 1 2026 $ +.\" $OpenBSD: ssh_config.5,v 1.428 2026/07/11 11:15:03 naddy Exp $ +.Dd $Mdocdate: July 11 2026 $ .Dt HPNSSH_CONFIG 5 .Os .Sh NAME @@ -499,7 +499,8 @@ ssh-ed25519,ecdsa-sha2-nistp256, ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, sk-ssh-ed25519@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com, -rsa-sha2-512,rsa-sha2-256 +rsa-sha2-512,rsa-sha2-256, +ssh-mldsa44-ed25519@openssh.com .Ed .Pp If the specified list begins with a @@ -1103,12 +1104,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, rsa-sha2-512-cert-v01@openssh.com, rsa-sha2-256-cert-v01@openssh.com, +ssh-mldsa44-ed25519-cert-v01@openssh.com, ssh-ed25519, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, sk-ssh-ed25519@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com, webauthn-sk-ecdsa-sha2-nistp256@openssh.com, -rsa-sha2-512,rsa-sha2-256 +rsa-sha2-512,rsa-sha2-256, +ssh-mldsa44-ed25519@openssh.com .Ed .Pp The @@ -1151,12 +1154,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, rsa-sha2-512-cert-v01@openssh.com, rsa-sha2-256-cert-v01@openssh.com, +ssh-mldsa44-ed25519-cert-v01@openssh.com, ssh-ed25519, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, sk-ecdsa-sha2-nistp256@openssh.com, webauthn-sk-ecdsa-sha2-nistp256@openssh.com sk-ssh-ed25519@openssh.com, -rsa-sha2-512,rsa-sha2-256 +rsa-sha2-512,rsa-sha2-256, +ssh-mldsa44-ed25519@openssh.com .Ed .Pp If hostkeys are known for the destination host then this default is modified @@ -1251,9 +1256,10 @@ The default is .Pa ~/.ssh/id_rsa , .Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa_sk , -.Pa ~/.ssh/id_ed25519 +.Pa ~/.ssh/id_ed25519 , +.Pa ~/.ssh/id_ed25519_sk and -.Pa ~/.ssh/id_ed25519_sk . +.Pa ~/.ssh/id_mldsa44_ed25519 . Additionally, any identities represented by the authentication agent will be used for authentication unless .Cm IdentitiesOnly @@ -1848,12 +1854,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, rsa-sha2-512-cert-v01@openssh.com, rsa-sha2-256-cert-v01@openssh.com, +ssh-mldsa44-ed25519-cert-v01@openssh.com, ssh-ed25519, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, sk-ssh-ed25519@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com, webauthn-sk-ecdsa-sha2-nistp256@openssh.com, -rsa-sha2-512,rsa-sha2-256 +rsa-sha2-512,rsa-sha2-256, +ssh-mldsa44-ed25519@openssh.com .Ed .Pp The list of available signature algorithms may also be obtained using diff --git a/hpnsshd.8 b/hpnsshd.8 index 3e7190776776..3051bcac3062 100644 --- a/hpnsshd.8 +++ b/hpnsshd.8 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.328 2025/10/04 21:41:35 naddy Exp $ -.Dd $Mdocdate: October 4 2025 $ +.\" $OpenBSD: sshd.8,v 1.330 2026/07/11 11:15:03 naddy Exp $ +.Dd $Mdocdate: July 11 2026 $ .Dt HPNSSHD 8 .Os .Sh NAME @@ -181,7 +181,8 @@ is not run as root (as the normal host key files are normally not readable by anyone but root). The default is .Pa /etc/ssh/ssh_host_ecdsa_key , -.Pa /etc/ssh/ssh_host_ed25519_key +.Pa /etc/ssh/ssh_host_ed25519_key , +.Pa /etc/ssh/ssh_host_mldsa44_ed25519_key and .Pa /etc/ssh/ssh_host_rsa_key . It is possible to have multiple host key files for @@ -469,6 +470,8 @@ sk-ssh-ed25519@openssh.com .It ssh-ed25519 .It +ssh-mldsa44-ed25519@openssh.com +.It ssh-rsa .El .Pp @@ -483,6 +486,7 @@ You don't want to type them in; instead, copy the .Pa id_ecdsa_sk.pub , .Pa id_ed25519.pub , .Pa id_ed25519_sk.pub , +.Pa id_mldsa44_ed25519 , or the .Pa id_rsa.pub file and edit it. @@ -959,6 +963,7 @@ rlogin/rsh. .Pp .It Pa /etc/hpnssh/ssh_host_ecdsa_key .It Pa /etc/hpnssh/ssh_host_ed25519_key +.It Pa /etc/hpnssh/ssh_host_mldsa44_ed25519_key .It Pa /etc/hpnssh/ssh_host_rsa_key These files contain the private parts of the host keys. These files should only be owned by root, readable only by root, and not @@ -969,6 +974,7 @@ does not start if these files are group/world-accessible. .Pp .It Pa /etc/hpnssh/ssh_host_ecdsa_key.pub .It Pa /etc/hpnssh/ssh_host_ed25519_key.pub +.It Pa /etc/ssh/ssh_host_mldsa44_ed25519_key.pub .It Pa /etc/hpnssh/ssh_host_rsa_key.pub These files contain the public parts of the host keys. These files should be world-readable but writable only by diff --git a/hpnsshd_config.5 b/hpnsshd_config.5 index 439927dbd28e..c42f28eb513e 100644 --- a/hpnsshd_config.5 +++ b/hpnsshd_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.399 2026/06/24 06:55:12 djm Exp $ -.Dd $Mdocdate: June 24 2026 $ +.\" $OpenBSD: sshd_config.5,v 1.402 2026/08/08 07:27:54 djm Exp $ +.Dd $Mdocdate: August 8 2026 $ .Dt HPNSSHD_CONFIG 5 .Os .Sh NAME @@ -401,7 +401,8 @@ ssh-ed25519,ecdsa-sha2-nistp256, ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, sk-ssh-ed25519@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com, -rsa-sha2-512,rsa-sha2-256 +rsa-sha2-512,rsa-sha2-256, +ssh-mldsa44-ed25519@openssh.com .Ed .Pp If the specified list begins with a @@ -817,12 +818,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, rsa-sha2-512-cert-v01@openssh.com, rsa-sha2-256-cert-v01@openssh.com, +ssh-mldsa44-ed25519-cert-v01@openssh.com, ssh-ed25519, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, sk-ssh-ed25519@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com, webauthn-sk-ecdsa-sha2-nistp256@openssh.com, -rsa-sha2-512,rsa-sha2-256 +rsa-sha2-512,rsa-sha2-256, +ssh-mldsa44-ed25519@openssh.com .Ed .Pp The list of available signature algorithms may also be obtained using @@ -865,6 +868,7 @@ used by SSH. The defaults are .Pa /etc/hpnssh/ssh_host_ecdsa_key , .Pa /etc/hpnssh/ssh_host_ed25519_key +.Pa /etc/hpnssh/ssh_host_mldsa44_ed25519_key and .Pa /etc/hpnssh/ssh_host_rsa_key . .Pp @@ -903,12 +907,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, rsa-sha2-512-cert-v01@openssh.com, rsa-sha2-256-cert-v01@openssh.com, +ssh-mldsa44-ed25519-cert-v01@openssh.com, ssh-ed25519, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, sk-ssh-ed25519@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com, webauthn-sk-ecdsa-sha2-nistp256@openssh.com, -rsa-sha2-512,rsa-sha2-256 +rsa-sha2-512,rsa-sha2-256, +ssh-mldsa44-ed25519@openssh.com .Ed .Pp The list of available signature algorithms may also be obtained using @@ -1096,6 +1102,8 @@ ecdh-sha2-nistp384 .It ecdh-sha2-nistp521 .It +mlkem768nistp256-sha256 +.It mlkem768x25519-sha256 .It sntrup761x25519-sha512 @@ -1789,12 +1797,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, rsa-sha2-512-cert-v01@openssh.com, rsa-sha2-256-cert-v01@openssh.com, +ssh-mldsa44-ed25519-cert-v01@openssh.com, ssh-ed25519, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, sk-ssh-ed25519@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com, webauthn-sk-ecdsa-sha2-nistp256@openssh.com, -rsa-sha2-512,rsa-sha2-256 +rsa-sha2-512,rsa-sha2-256, +ssh-mldsa44-ed25519@openssh.com .Ed .Pp The list of available signature algorithms may also be obtained using diff --git a/kex-names.c b/kex-names.c index 751f06cea204..116150316ee9 100644 --- a/kex-names.c +++ b/kex-names.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kex-names.c,v 1.7 2026/02/14 00:18:34 jsg Exp $ */ +/* $OpenBSD: kex-names.c,v 1.10 2026/08/08 07:27:54 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -58,19 +58,17 @@ static const struct kexalg kexalgs[] = { { KEX_DH16_SHA512, KEX_DH_GRP16_SHA512, 0, SSH_DIGEST_SHA512, KEX_NOT_PQ }, { KEX_DH18_SHA512, KEX_DH_GRP18_SHA512, 0, SSH_DIGEST_SHA512, KEX_NOT_PQ }, { KEX_DHGEX_SHA1, KEX_DH_GEX_SHA1, 0, SSH_DIGEST_SHA1, KEX_NOT_PQ }, -#ifdef HAVE_EVP_SHA256 +# ifdef HAVE_EVP_SHA256 { KEX_DHGEX_SHA256, KEX_DH_GEX_SHA256, 0, SSH_DIGEST_SHA256, KEX_NOT_PQ }, -#endif /* HAVE_EVP_SHA256 */ -#ifdef OPENSSL_HAS_ECC +# endif /* HAVE_EVP_SHA256 */ { KEX_ECDH_SHA2_NISTP256, KEX_ECDH_SHA2, NID_X9_62_prime256v1, SSH_DIGEST_SHA256, KEX_NOT_PQ }, { KEX_ECDH_SHA2_NISTP384, KEX_ECDH_SHA2, NID_secp384r1, SSH_DIGEST_SHA384, KEX_NOT_PQ }, -# ifdef OPENSSL_HAS_NISTP521 { KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1, SSH_DIGEST_SHA512, KEX_NOT_PQ }, -# endif /* OPENSSL_HAS_NISTP521 */ -#endif /* OPENSSL_HAS_ECC */ + { KEX_MLKEM768NISTP256_SHA256, KEX_KEM_MLKEM768ECDH_SHA256, + NID_X9_62_prime256v1, SSH_DIGEST_SHA256, KEX_IS_PQ }, #endif /* WITH_OPENSSL */ #if defined(HAVE_EVP_SHA256) || !defined(WITH_OPENSSL) { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256, KEX_NOT_PQ }, diff --git a/kex.c b/kex.c index 93a7a662c34b..b561f02e8c6d 100644 --- a/kex.c +++ b/kex.c @@ -733,9 +733,7 @@ kex_free(struct kex *kex) #ifdef WITH_OPENSSL DH_free(kex->dh); -#ifdef OPENSSL_HAS_ECC EC_KEY_free(kex->ec_client_key); -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ for (mode = 0; mode < MODE_MAX; mode++) { kex_free_newkeys(kex->newkeys[mode]); diff --git a/kex.h b/kex.h index a4d50f1a3d24..9816b1d8384e 100644 --- a/kex.h +++ b/kex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.130 2026/05/31 04:44:38 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.134 2026/08/08 07:27:54 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -30,22 +30,15 @@ #include "crypto_api.h" #ifdef WITH_OPENSSL -# include -# include -# include -# ifdef OPENSSL_HAS_ECC -# include -# else /* OPENSSL_HAS_ECC */ -# define EC_KEY void -# define EC_GROUP void -# define EC_POINT void -# endif /* OPENSSL_HAS_ECC */ -#else /* WITH_OPENSSL */ -# define DH void -# define BIGNUM void -# define EC_KEY void -# define EC_GROUP void -# define EC_POINT void +#include +#include +#include +#include +#else /* OPENSSL */ +#define BIGNUM void +#define DH void +#define EC_KEY void +#define EC_GROUP void #endif /* WITH_OPENSSL */ #define KEX_COOKIE_LEN 16 @@ -65,6 +58,7 @@ #define KEX_SNTRUP761X25519_SHA512 "sntrup761x25519-sha512" #define KEX_SNTRUP761X25519_SHA512_OLD "sntrup761x25519-sha512@openssh.com" #define KEX_MLKEM768X25519_SHA256 "mlkem768x25519-sha256" +#define KEX_MLKEM768NISTP256_SHA256 "mlkem768nistp256-sha256" #define COMP_NONE 0 #define COMP_DELAYED 2 @@ -103,6 +97,7 @@ enum kex_exchange { KEX_C25519_SHA256, KEX_KEM_SNTRUP761X25519_SHA512, KEX_KEM_MLKEM768X25519_SHA256, + KEX_KEM_MLKEM768ECDH_SHA256, KEX_MAX }; @@ -239,6 +234,9 @@ int kex_dh_enc(struct kex *, const struct sshbuf *, struct sshbuf **, struct sshbuf **); int kex_dh_dec(struct kex *, const struct sshbuf *, struct sshbuf **); +int kex_ecdh_dec_key_group(struct kex *, const struct sshbuf *, EC_KEY *key, + const EC_GROUP *, int, struct sshbuf **); + int kex_ecdh_keypair(struct kex *); int kex_ecdh_enc(struct kex *, const struct sshbuf *, struct sshbuf **, struct sshbuf **); @@ -261,6 +259,12 @@ int kex_kem_mlkem768x25519_enc(struct kex *, const struct sshbuf *, int kex_kem_mlkem768x25519_dec(struct kex *, const struct sshbuf *, struct sshbuf **); +int kex_kem_mlkem768ecdh_keypair(struct kex *); +int kex_kem_mlkem768ecdh_enc(struct kex *, const struct sshbuf *, + struct sshbuf **, struct sshbuf **); +int kex_kem_mlkem768ecdh_dec(struct kex *, const struct sshbuf *, + struct sshbuf **); + int kex_dh_keygen(struct kex *); int kex_dh_compute_key(struct kex *, BIGNUM *, struct sshbuf *); @@ -287,10 +291,4 @@ int kexc25519_shared_key_ext(const u_char key[CURVE25519_SIZE], void dump_digest(const char *, const u_char *, int); #endif -#if !defined(WITH_OPENSSL) || !defined(OPENSSL_HAS_ECC) -# undef EC_KEY -# undef EC_GROUP -# undef EC_POINT -#endif - #endif diff --git a/kexecdh.c b/kexecdh.c index 6a9058cdc140..a9dbf5c4ba02 100644 --- a/kexecdh.c +++ b/kexecdh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexecdh.c,v 1.12 2026/02/14 00:18:34 jsg Exp $ */ +/* $OpenBSD: kexecdh.c,v 1.14 2026/08/03 06:43:16 djm Exp $ */ /* * Copyright (c) 2010 Damien Miller. All rights reserved. * Copyright (c) 2019 Markus Friedl. All rights reserved. @@ -26,7 +26,7 @@ #include "includes.h" -#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) +#if defined(WITH_OPENSSL) #include @@ -41,10 +41,6 @@ #include "sshbuf.h" #include "ssherr.h" -static int -kex_ecdh_dec_key_group(struct kex *, const struct sshbuf *, EC_KEY *key, - const EC_GROUP *, struct sshbuf **); - int kex_ecdh_keypair(struct kex *kex) { @@ -123,7 +119,7 @@ kex_ecdh_enc(struct kex *kex, const struct sshbuf *client_blob, (r = sshbuf_get_u32(server_blob, NULL)) != 0) goto out; if ((r = kex_ecdh_dec_key_group(kex, client_blob, server_key, group, - shared_secretp)) != 0) + 0, shared_secretp)) != 0) goto out; *server_blobp = server_blob; server_blob = NULL; @@ -133,9 +129,9 @@ kex_ecdh_enc(struct kex *kex, const struct sshbuf *client_blob, return r; } -static int +int kex_ecdh_dec_key_group(struct kex *kex, const struct sshbuf *ec_blob, - EC_KEY *key, const EC_GROUP *group, struct sshbuf **shared_secretp) + EC_KEY *key, const EC_GROUP *group, int raw, struct sshbuf **shared_secretp) { struct sshbuf *buf = NULL; BIGNUM *shared_secret = NULL; @@ -170,21 +166,32 @@ kex_ecdh_dec_key_group(struct kex *kex, const struct sshbuf *ec_blob, goto out; } klen = (EC_GROUP_get_degree(group) + 7) / 8; - if ((kbuf = malloc(klen)) == NULL || - (shared_secret = BN_new()) == NULL) { + if ((kbuf = malloc(klen)) == NULL) { r = SSH_ERR_ALLOC_FAIL; goto out; } - if (ECDH_compute_key(kbuf, klen, dh_pub, key, NULL) != (int)klen || - BN_bin2bn(kbuf, klen, shared_secret) == NULL) { + if (ECDH_compute_key(kbuf, klen, dh_pub, key, NULL) != (int)klen) { r = SSH_ERR_LIBCRYPTO_ERROR; goto out; } #ifdef DEBUG_KEXECDH dump_digest("shared secret", kbuf, klen); #endif - if ((r = sshbuf_put_bignum2(buf, shared_secret)) != 0) - goto out; + if (raw) { + if ((r = sshbuf_put(buf, kbuf, klen)) != 0) + goto out; + } else { + if ((shared_secret = BN_new()) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + if (BN_bin2bn(kbuf, klen, shared_secret) == NULL) { + r = SSH_ERR_LIBCRYPTO_ERROR; + goto out; + } + if ((r = sshbuf_put_bignum2(buf, shared_secret)) != 0) + goto out; + } *shared_secretp = buf; buf = NULL; out: @@ -202,37 +209,10 @@ kex_ecdh_dec(struct kex *kex, const struct sshbuf *server_blob, int r; r = kex_ecdh_dec_key_group(kex, server_blob, kex->ec_client_key, - kex->ec_group, shared_secretp); + kex->ec_group, 0, shared_secretp); EC_KEY_free(kex->ec_client_key); kex->ec_client_key = NULL; return r; } -#else - -#include "ssherr.h" - -struct kex; -struct sshbuf; -struct sshkey; - -int -kex_ecdh_keypair(struct kex *kex) -{ - return SSH_ERR_SIGN_ALG_UNSUPPORTED; -} - -int -kex_ecdh_enc(struct kex *kex, const struct sshbuf *client_blob, - struct sshbuf **server_blobp, struct sshbuf **shared_secretp) -{ - return SSH_ERR_SIGN_ALG_UNSUPPORTED; -} - -int -kex_ecdh_dec(struct kex *kex, const struct sshbuf *server_blob, - struct sshbuf **shared_secretp) -{ - return SSH_ERR_SIGN_ALG_UNSUPPORTED; -} -#endif /* defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) */ +#endif /* WITH_OPENSSL */ diff --git a/kexgen.c b/kexgen.c index 5643bc83187f..d1f9d840a102 100644 --- a/kexgen.c +++ b/kexgen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexgen.c,v 1.12 2026/03/03 09:57:25 dtucker Exp $ */ +/* $OpenBSD: kexgen.c,v 1.14 2026/07/30 07:29:09 dtucker Exp $ */ /* * Copyright (c) 2019 Markus Friedl. All rights reserved. * @@ -113,6 +113,9 @@ kex_gen_client(struct ssh *ssh) case KEX_ECDH_SHA2: r = kex_ecdh_keypair(kex); break; + case KEX_KEM_MLKEM768ECDH_SHA256: + r = kex_kem_mlkem768ecdh_keypair(kex); + break; #endif /* WITH_OPENSSL */ case KEX_C25519_SHA256: r = kex_c25519_keypair(kex); @@ -187,6 +190,10 @@ input_kex_gen_reply(int type, uint32_t seq, struct ssh *ssh) case KEX_ECDH_SHA2: r = kex_ecdh_dec(kex, server_blob, &shared_secret); break; + case KEX_KEM_MLKEM768ECDH_SHA256: + r = kex_kem_mlkem768ecdh_dec(kex, server_blob, + &shared_secret); + break; #endif /* WITH_OPENSSL */ case KEX_C25519_SHA256: r = kex_c25519_dec(kex, server_blob, &shared_secret); @@ -310,6 +317,10 @@ input_kex_gen_init(int type, uint32_t seq, struct ssh *ssh) r = kex_ecdh_enc(kex, client_pubkey, &server_pubkey, &shared_secret); break; + case KEX_KEM_MLKEM768ECDH_SHA256: + r = kex_kem_mlkem768ecdh_enc(kex, client_pubkey, + &server_pubkey, &shared_secret); + break; #endif /* WITH_OPENSSL */ case KEX_C25519_SHA256: r = kex_c25519_enc(kex, client_pubkey, &server_pubkey, diff --git a/kexmlkem768ecdh.c b/kexmlkem768ecdh.c new file mode 100644 index 000000000000..b43b1b3cb2a2 --- /dev/null +++ b/kexmlkem768ecdh.c @@ -0,0 +1,308 @@ +/* $OpenBSD: kexmlkem768ecdh.c,v 1.4 2026/08/03 06:43:16 djm Exp $ */ +/* + * Copyright (c) 2025 Markus Friedl. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" + +#include + +#include +#include +#include +#include +#include +#include + +#include "sshkey.h" +#include "kex.h" +#include "sshbuf.h" +#include "digest.h" +#include "ssherr.h" + +#ifdef WITH_OPENSSL +int +kex_kem_mlkem768ecdh_keypair(struct kex *kex) +{ + struct sshbuf *buf = NULL; + struct sshbuf *ec_blob = NULL; + EC_KEY *client_key = NULL; + const EC_GROUP *group; + const EC_POINT *public_key; + u_char *cp = NULL; + size_t need; + int r = SSH_ERR_INTERNAL_ERROR; + + if ((buf = sshbuf_new()) == NULL) + return SSH_ERR_ALLOC_FAIL; + need = MLKEM768_PUBLICKEYBYTES; + if ((r = sshbuf_reserve(buf, need, &cp)) != 0) + goto out; + if (crypto_kem_mlkem768_keypair(cp, kex->mlkem768_client_key) != 0) { + r = SSH_ERR_INTERNAL_ERROR; + goto out; + } +#ifdef DEBUG_KEXECDH + dump_digest("client public key mlkem768:", cp, + MLKEM768_PUBLICKEYBYTES); +#endif + if ((client_key = EC_KEY_new_by_curve_name(kex->ec_nid)) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + if (EC_KEY_generate_key(client_key) != 1) { + r = SSH_ERR_LIBCRYPTO_ERROR; + goto out; + } + group = EC_KEY_get0_group(client_key); + public_key = EC_KEY_get0_public_key(client_key); + + if ((ec_blob = sshbuf_new()) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + if ((r = sshbuf_put_ec(ec_blob, public_key, group)) != 0 || + (r = sshbuf_get_u32(ec_blob, NULL)) != 0 || + (r = sshbuf_putb(buf, ec_blob)) != 0) + goto out; +#ifdef DEBUG_KEXECDH + fputs("client private key EC:\n", stderr); + sshkey_dump_ec_key(client_key); +#endif + /* success */ + r = 0; + kex->ec_client_key = client_key; + kex->ec_group = group; + client_key = NULL; /* owned by the kex */ + kex->client_pub = buf; + buf = NULL; + out: + sshbuf_free(buf); + sshbuf_free(ec_blob); + EC_KEY_free(client_key); + return r; +} + +int +kex_kem_mlkem768ecdh_enc(struct kex *kex, + const struct sshbuf *client_blob, struct sshbuf **server_blobp, + struct sshbuf **shared_secretp) +{ + const EC_GROUP *group; + const EC_POINT *pub_key; + EC_KEY *server_key = NULL; + struct sshbuf *ec_pub = NULL; + struct sshbuf *ec_blob = NULL; + struct sshbuf *ec_shared = NULL; + struct sshbuf *server_blob = NULL; + struct sshbuf *buf = NULL; + const u_char *client_pub; + u_char hash[SSH_DIGEST_MAX_LENGTH]; + u_char ct[MLKEM768_CIPHERTEXTBYTES]; + u_char shared_secret[MLKEM768_BYTES]; + size_t need; + int r = SSH_ERR_INTERNAL_ERROR; + + *server_blobp = NULL; + *shared_secretp = NULL; + + /* client_blob contains both KEM and ECDH client pubkeys */ + need = MLKEM768_PUBLICKEYBYTES; + if (sshbuf_len(client_blob) <= need) { + r = SSH_ERR_SIGNATURE_INVALID; + goto out; + } + client_pub = sshbuf_ptr(client_blob); +#ifdef DEBUG_KEXECDH + dump_digest("client public key mlkem768:", client_pub, + MLKEM768_PUBLICKEYBYTES); +#endif + + /* allocate buffer for concatenation of KEM key and ECDH shared key */ + /* the buffer will be hashed and the result is the shared secret */ + if ((buf = sshbuf_new()) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + /* allocate space for encrypted KEM key and ECDH pub key */ + if ((server_blob = sshbuf_new()) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + /* generate and encrypt KEM key with client key */ + if (crypto_kem_mlkem768_enc(ct, shared_secret, client_pub) != 0) { + r = SSH_ERR_INTERNAL_ERROR; + goto out; + } + if ((r = sshbuf_put(buf, shared_secret, sizeof(shared_secret))) != 0 || + (r = sshbuf_put(server_blob, ct, sizeof(ct))) != 0) + goto out; + + client_pub += MLKEM768_PUBLICKEYBYTES; + if ((ec_pub = sshbuf_from(client_pub, sshbuf_len(client_blob) - + MLKEM768_PUBLICKEYBYTES)) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + /* generate ECDH key pair */ + if ((server_key = EC_KEY_new_by_curve_name(kex->ec_nid)) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + if (EC_KEY_generate_key(server_key) != 1) { + r = SSH_ERR_LIBCRYPTO_ERROR; + goto out; + } + group = EC_KEY_get0_group(server_key); +#ifdef DEBUG_KEXECDH + fputs("server private key EC:\n", stderr); + sshkey_dump_ec_key(server_key); +#endif + /* store server pubkey after ciphertext */ + pub_key = EC_KEY_get0_public_key(server_key); + if ((ec_blob = sshbuf_new()) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + if ((r = sshbuf_put_ec(ec_blob, pub_key, group)) != 0 || + (r = sshbuf_get_u32(ec_blob, NULL)) != 0 || + (r = sshbuf_putb(server_blob, ec_blob)) != 0) + goto out; + + /* append ECDH shared key */ + if ((r = kex_ecdh_dec_key_group(kex, ec_pub, server_key, group, + 1, &ec_shared)) != 0 || + (r = sshbuf_putb(buf, ec_shared)) != 0) + goto out; + + if ((r = ssh_digest_buffer(kex->hash_alg, buf, hash, sizeof(hash))) != 0) + goto out; +#ifdef DEBUG_KEXECDH + dump_digest("server cipher text:", ct, sizeof(ct)); + dump_digest("server kem key:", shared_secret, sizeof(shared_secret)); + dump_digest("concatenation of KEM key and ECDH shared key:", + sshbuf_ptr(buf), sshbuf_len(buf)); +#endif + /* string-encoded hash is resulting shared secret */ + sshbuf_reset(buf); + if ((r = sshbuf_put_string(buf, hash, + ssh_digest_bytes(kex->hash_alg))) != 0) + goto out; +#ifdef DEBUG_KEXECDH + dump_digest("encoded shared secret:", sshbuf_ptr(buf), sshbuf_len(buf)); +#endif + /* success */ + r = 0; + *server_blobp = server_blob; + *shared_secretp = buf; + server_blob = NULL; + buf = NULL; + out: + explicit_bzero(hash, sizeof(hash)); + explicit_bzero(shared_secret, sizeof(shared_secret)); + EC_KEY_free(server_key); + sshbuf_free(ec_pub); + sshbuf_free(ec_blob); + sshbuf_free(ec_shared); + sshbuf_free(server_blob); + sshbuf_free(buf); + return r; +} + +int +kex_kem_mlkem768ecdh_dec(struct kex *kex, + const struct sshbuf *server_blob, struct sshbuf **shared_secretp) +{ + struct sshbuf *buf = NULL; + struct sshbuf *ec_pub = NULL; + struct sshbuf *ec_shared = NULL; + u_char shared_secret[MLKEM768_BYTES]; + const u_char *ciphertext, *server_pub; + u_char hash[SSH_DIGEST_MAX_LENGTH]; + size_t need; + int r; + + *shared_secretp = NULL; + + need = MLKEM768_CIPHERTEXTBYTES; + if (sshbuf_len(server_blob) <= need) { + r = SSH_ERR_SIGNATURE_INVALID; + goto out; + } + ciphertext = sshbuf_ptr(server_blob); + server_pub = ciphertext + MLKEM768_CIPHERTEXTBYTES; +#ifdef DEBUG_KEXECDH + dump_digest("server cipher text (dec):", ciphertext, + MLKEM768_CIPHERTEXTBYTES); +#endif + /* hash concatenation of KEM key and ECDH shared key */ + if ((buf = sshbuf_new()) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + if (crypto_kem_mlkem768_dec(shared_secret, ciphertext, + kex->mlkem768_client_key) != 0) { + r = SSH_ERR_INTERNAL_ERROR; + goto out; + } + if ((r = sshbuf_put(buf, shared_secret, sizeof(shared_secret))) != 0) + goto out; + if ((ec_pub = sshbuf_from(server_pub, sshbuf_len(server_blob) - need)) + == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + if ((r = kex_ecdh_dec_key_group(kex, ec_pub, kex->ec_client_key, + kex->ec_group, 1, &ec_shared)) != 0 || + (r = sshbuf_putb(buf, ec_shared)) != 0) + goto out; + if ((r = ssh_digest_buffer(kex->hash_alg, buf, + hash, sizeof(hash))) != 0) + goto out; +#ifdef DEBUG_KEXECDH + dump_digest("client kem key:", shared_secret, sizeof(shared_secret)); + dump_digest("concatenation of KEM key and ECDH shared key:", + sshbuf_ptr(buf), sshbuf_len(buf)); +#endif + sshbuf_reset(buf); + if ((r = sshbuf_put_string(buf, hash, + ssh_digest_bytes(kex->hash_alg))) != 0) + goto out; +#ifdef DEBUG_KEXECDH + dump_digest("encoded shared secret:", sshbuf_ptr(buf), sshbuf_len(buf)); +#endif + /* success */ + r = 0; + *shared_secretp = buf; + buf = NULL; + out: + explicit_bzero(hash, sizeof(hash)); + explicit_bzero(shared_secret, sizeof(shared_secret)); + EC_KEY_free(kex->ec_client_key); + kex->ec_client_key = NULL; + sshbuf_free(ec_pub); + sshbuf_free(ec_shared); + sshbuf_free(buf); + return r; +} +#endif /* WITH_OPENSSL */ diff --git a/misc.c b/misc.c index 3fb9a02b524a..1e749f9cc1c8 100644 --- a/misc.c +++ b/misc.c @@ -104,6 +104,7 @@ fips_enabled() * again fail to returning fips being disabled */ debug3_f("Error processing fips_enabled."); + fclose(fips_enabled); return 0; } @@ -113,6 +114,7 @@ fips_enabled() else debug3_f("FIPS mode is enabled."); + fclose(fips_enabled); return mode; } diff --git a/moduli.0 b/moduli.0 new file mode 100644 index 000000000000..d640f6cb3bc7 --- /dev/null +++ b/moduli.0 @@ -0,0 +1,74 @@ +MODULI(5) File Formats Manual MODULI(5) + +NAME + moduli M-bM-^@M-^S Diffie-Hellman moduli + +DESCRIPTION + The /etc/moduli file contains prime numbers and generators for use by + sshd(8) in the Diffie-Hellman Group Exchange key exchange method. + + New moduli may be generated with ssh-keygen(1) using a two-step process. + An initial candidate generation pass, using ssh-keygen -M generate, + calculates numbers that are likely to be useful. A second primality + testing pass, using ssh-keygen -M screen, provides a high degree of + assurance that the numbers are prime and are safe for use in Diffie- + Hellman operations by sshd(8). This moduli format is used as the output + from each pass. + + The file consists of newline-separated records, one per modulus, + containing seven space-separated fields. These fields are as follows: + + timestamp The time that the modulus was last processed as + YYYYMMDDHHMMSS. + + type Decimal number specifying the internal structure of + the prime modulus. Supported types are: + + 0 Unknown, not tested. + 2 "Safe" prime; (p-1)/2 is also prime. + 4 Sophie Germain; 2p+1 is also prime. + + Moduli candidates initially produced by ssh-keygen(1) + are Sophie Germain primes (type 4). Further primality + testing with ssh-keygen(1) produces safe prime moduli + (type 2) that are ready for use in sshd(8). Other + types are not used by OpenSSH. + + tests Decimal number indicating the type of primality tests + that the number has been subjected to represented as a + bitmask of the following values: + + 0x00 Not tested. + 0x01 Composite number M-bM-^@M-^S not prime. + 0x02 Sieve of Eratosthenes. + 0x04 Probabilistic Miller-Rabin primality tests. + + The ssh-keygen(1) moduli candidate generation uses the + Sieve of Eratosthenes (flag 0x02). Subsequent + ssh-keygen(1) primality tests are Miller-Rabin tests + (flag 0x04). + + trials Decimal number indicating the number of primality + trials that have been performed on the modulus. + + size Decimal number indicating the size of the prime in + bits. + + generator The recommended generator for use with this modulus + (hexadecimal). + + modulus The modulus itself in hexadecimal. + + When performing Diffie-Hellman Group Exchange, sshd(8) first estimates + the size of the modulus required to produce enough Diffie-Hellman output + to sufficiently key the selected symmetric cipher. sshd(8) then randomly + selects a modulus from /etc/moduli that best meets the size requirement. + +SEE ALSO + ssh-keygen(1), sshd(8) + +STANDARDS + M. Friedl, N. Provos, and W. Simpson, Diffie-Hellman Group Exchange for + the Secure Shell (SSH) Transport Layer Protocol, RFC 4419, March 2006. + +OpenBSD 8.0 April 16, 2022 MODULI(5) diff --git a/monitor.c b/monitor.c index dbdebc444771..7b7998bfedb0 100644 --- a/monitor.c +++ b/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.256 2026/05/31 11:30:50 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.258 2026/07/27 12:28:52 markus Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -716,6 +716,7 @@ mm_answer_sign(struct ssh *ssh, int sock, struct sshbuf *m) int r, is_proof = 0, keyid; u_int compat; const char proof_req[] = "hostkeys-prove-00@openssh.com"; + static int nhostkey_proofs_done, *hostkey_proofs_done; debug3_f("entering"); @@ -754,6 +755,17 @@ mm_answer_sign(struct ssh *ssh, int sock, struct sshbuf *m) fatal_f("bad data length: %zu", datlen); if ((key = get_hostkey_public_by_index(keyid, ssh)) == NULL) fatal_f("no hostkey for index %d", keyid); + if (keyid >= nhostkey_proofs_done) { + hostkey_proofs_done = xrecallocarray( + hostkey_proofs_done, nhostkey_proofs_done, + keyid + 1, sizeof(*hostkey_proofs_done)); + nhostkey_proofs_done = keyid + 1; + } + if (hostkey_proofs_done[keyid]) { + fatal_f("hostkeys proof requested for %s key %d " + "multiple times", sshkey_type(key), keyid); + } + hostkey_proofs_done[keyid] = 1; if ((sigbuf = sshbuf_new()) == NULL) fatal_f("sshbuf_new"); if ((r = sshbuf_put_cstring(sigbuf, proof_req)) != 0 || @@ -1862,10 +1874,9 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor) kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server; kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -# ifdef OPENSSL_HAS_ECC kex->kex[KEX_ECDH_SHA2] = kex_gen_server; -# endif -#endif /* WITH_OPENSSL */ + kex->kex[KEX_KEM_MLKEM768ECDH_SHA256] = kex_gen_server; +#endif kex->kex[KEX_C25519_SHA256] = kex_gen_server; kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_server; kex->kex[KEX_KEM_MLKEM768X25519_SHA256] = kex_gen_server; diff --git a/monitor_wrap.c b/monitor_wrap.c index e2b9a2802898..e9a771b344ea 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.147 2026/05/31 11:30:50 djm Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.148 2026/07/21 06:17:42 djm Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -384,6 +384,8 @@ mm_getpwnamallow(struct ssh *ssh, const char *username) server_process_permitopen(ssh); server_process_channel_timeouts(ssh); kex_set_server_sig_algs(ssh, options.pubkey_accepted_algos); + ssh_packet_set_rekey_limits(ssh, options.rekey_limit, + options.rekey_interval); sshbuf_free(m); return (pw); diff --git a/myproposal.h b/myproposal.h index 6835dd2068a3..5ec050c1b2e5 100644 --- a/myproposal.h +++ b/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.78 2026/02/05 22:05:49 djm Exp $ */ +/* $OpenBSD: myproposal.h,v 1.80 2026/08/10 23:27:04 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -58,7 +58,7 @@ "sk-ecdsa-sha2-nistp256@openssh.com," \ "webauthn-sk-ecdsa-sha2-nistp256@openssh.com," \ "rsa-sha2-512," \ - "rsa-sha2-256" + "rsa-sha2-256" \ /*if we aren't using OpenSSL we need to remove * the parallel ChaCha20 cipher from the list */ @@ -101,7 +101,7 @@ "sk-ecdsa-sha2-nistp256@openssh.com," \ "webauthn-sk-ecdsa-sha2-nistp256@openssh.com," \ "rsa-sha2-512," \ - "rsa-sha2-256" + "rsa-sha2-256" \ #define KEX_DEFAULT_COMP "none,zlib@openssh.com" #define KEX_DEFAULT_LANG "" diff --git a/openbsd-compat/fake-rfc2553.c b/openbsd-compat/fake-rfc2553.c index 5197c3b3790f..4065a19fe3d2 100644 --- a/openbsd-compat/fake-rfc2553.c +++ b/openbsd-compat/fake-rfc2553.c @@ -51,7 +51,7 @@ int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, struct hostent *hp; char tmpserv[16]; - if (sa->sa_family != AF_UNSPEC && sa->sa_family != AF_INET || + if ((sa->sa_family != AF_UNSPEC && sa->sa_family != AF_INET) || salen < sizeof(struct sockaddr_in)) return (EAI_FAMILY); if (serv != NULL) { diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 42e2e2833301..0dc0794d58a3 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -25,9 +25,7 @@ #include #include #include -#ifdef OPENSSL_HAS_ECC #include -#endif #include int ssh_compatible_openssl(long, long); diff --git a/packet.c b/packet.c index a6265a36ad54..54846c49bc2e 100644 --- a/packet.c +++ b/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.339 2026/06/30 00:09:01 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.341 2026/07/23 06:33:06 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -67,9 +67,7 @@ #ifdef WITH_OPENSSL # include # include -# ifdef OPENSSL_HAS_ECC -# include -# endif +# include #endif #ifdef WITH_ZLIB @@ -1652,7 +1650,7 @@ ssh_packet_read(struct ssh *ssh) int r; if ((r = ssh_packet_read_seqnr(ssh, &type, NULL)) != 0) - fatal_fr(r, "read"); + sshpkt_fatal(ssh, r, "read"); return type; } @@ -2121,7 +2119,7 @@ ssh_packet_send_debug(struct ssh *ssh, const char *fmt,...) (r = sshpkt_put_cstring(ssh, "")) != 0 || (r = sshpkt_send(ssh)) != 0 || (r = ssh_packet_write_wait(ssh)) != 0) - fatal_fr(r, "send DEBUG"); + sshpkt_fatal(ssh, r, "send DEBUG"); } void @@ -2452,6 +2450,9 @@ ssh_packet_get_maxsize(struct ssh *ssh) void ssh_packet_set_rekey_limits(struct ssh *ssh, uint64_t bytes, uint32_t seconds) { + if (bytes == 0 && seconds == 0) + return; + debug3("rekey after %llu bytes, %u seconds", (unsigned long long)bytes, (unsigned int)seconds); ssh->state->rekey_limit = bytes; @@ -2848,7 +2849,6 @@ sshpkt_put_stringb(struct ssh *ssh, const struct sshbuf *v) } #ifdef WITH_OPENSSL -#ifdef OPENSSL_HAS_ECC int sshpkt_put_ec(struct ssh *ssh, const EC_POINT *v, const EC_GROUP *g) { @@ -2860,7 +2860,6 @@ sshpkt_put_ec_pkey(struct ssh *ssh, EVP_PKEY *pkey) { return sshbuf_put_ec_pkey(ssh->state->outgoing_packet, pkey); } -#endif /* OPENSSL_HAS_ECC */ int sshpkt_put_bignum2(struct ssh *ssh, const BIGNUM *v) @@ -2926,13 +2925,11 @@ sshpkt_getb_froms(struct ssh *ssh, struct sshbuf **valp) } #ifdef WITH_OPENSSL -#ifdef OPENSSL_HAS_ECC int sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g) { return sshbuf_get_ec(ssh->state->incoming_packet, v, g); } -#endif /* OPENSSL_HAS_ECC */ int sshpkt_get_bignum2(struct ssh *ssh, BIGNUM **valp) diff --git a/packet.h b/packet.h index 2502dc060492..90ac1b07f56d 100644 --- a/packet.h +++ b/packet.h @@ -23,21 +23,15 @@ #include #ifdef WITH_OPENSSL -# include -# include -# ifdef OPENSSL_HAS_ECC -# include -# else /* OPENSSL_HAS_ECC */ -# define EC_KEY void -# define EC_GROUP void -# define EC_POINT void -# endif /* OPENSSL_HAS_ECC */ -#else /* WITH_OPENSSL */ -# define BIGNUM void -# define EC_KEY void -# define EC_GROUP void -# define EC_POINT void -# define EVP_PKEY void +#include +#include +#include +#include +#else /* OPENSSL */ +#define BIGNUM void +#define EC_GROUP void +#define EC_POINT void +#define EVP_PKEY void #endif /* WITH_OPENSSL */ struct kex; @@ -233,16 +227,4 @@ void sshpkt_fmt_connection_id(struct ssh *ssh, char *s, size_t l); const u_char *sshpkt_ptr(struct ssh *, size_t *lenp); char *connection_info_message(struct ssh *ssh); -#if !defined(WITH_OPENSSL) -# undef BIGNUM -# undef EC_KEY -# undef EC_GROUP -# undef EC_POINT -# undef EVP_PKEY -#elif !defined(OPENSSL_HAS_ECC) -# undef EC_KEY -# undef EC_GROUP -# undef EC_POINT -#endif - #endif /* PACKET_H */ diff --git a/readconf.c b/readconf.c index e25f609e59f1..f2f1b407d1f1 100644 --- a/readconf.c +++ b/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.413 2026/06/29 08:16:46 djm Exp $ */ +/* $OpenBSD: readconf.c,v 1.415 2026/07/21 05:21:29 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -2856,10 +2856,10 @@ initialize_options(Options * options) options->bind_interface = NULL; options->pkcs11_provider = NULL; options->sk_provider = NULL; - options->enable_ssh_keysign = - 1; - options->no_host_authentication_for_localhost = - 1; - options->identities_only = - 1; - options->rekey_limit = - 1; + options->enable_ssh_keysign = -1; + options->no_host_authentication_for_localhost = -1; + options->identities_only = -1; + options->rekey_limit = -1; options->rekey_interval = -1; options->verify_host_key_dns = -1; options->server_alive_interval = -1; @@ -3019,15 +3019,15 @@ fill_default_options(Options * options) } if (options->num_identity_files == 0) { add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA, 0); -#ifdef OPENSSL_HAS_ECC add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA, 0); add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_SK, 0); -#endif add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ED25519, 0); add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ED25519_SK, 0); + add_identity_file(options, "~/", + _PATH_SSH_CLIENT_ID_MLDSA44_ED25519, 0); } if (options->escape_char == -1) options->escape_char = '~'; @@ -3056,7 +3056,7 @@ fill_default_options(Options * options) options->log_level = SYSLOG_LEVEL_INFO; if (options->log_facility == SYSLOG_FACILITY_NOT_SET) options->log_facility = SYSLOG_FACILITY_USER; - if (options->no_host_authentication_for_localhost == - 1) + if (options->no_host_authentication_for_localhost == -1) options->no_host_authentication_for_localhost = 0; if (options->identities_only == -1) options->identities_only = 0; diff --git a/regress/Makefile b/regress/Makefile index e44c0e973bfe..c632ec42cb1e 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.144 2026/03/30 07:19:02 djm Exp $ +# $OpenBSD: Makefile,v 1.146 2026/08/04 02:48:00 djm Exp $ tests: prep file-tests t-exec unit diff --git a/regress/agent.sh b/regress/agent.sh index bdd08c6bb4f6..42c6a6c3135d 100644 --- a/regress/agent.sh +++ b/regress/agent.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent.sh,v 1.26 2026/06/15 06:36:52 djm Exp $ +# $OpenBSD: agent.sh,v 1.27 2026/08/03 06:53:11 djm Exp $ # Placed in the Public Domain. tid="simple agent test" @@ -64,6 +64,7 @@ done # Remove explicit identity directives from ssh_proxy mv $OBJ/ssh_proxy $OBJ/ssh_proxy_bak grep -vi identityfile $OBJ/ssh_proxy_bak > $OBJ/ssh_proxy +echo "MaxAuthTries 64" >> $OBJ/sshd_proxy ${SSHADD} -l > /dev/null 2>&1 r=$? diff --git a/regress/cfgparse.sh b/regress/cfgparse.sh index 0a5010a96e1a..6457d50a58c6 100644 --- a/regress/cfgparse.sh +++ b/regress/cfgparse.sh @@ -1,13 +1,8 @@ -# $OpenBSD: cfgparse.sh,v 1.9 2025/09/26 04:40:45 dtucker Exp $ +# $OpenBSD: cfgparse.sh,v 1.12 2026/07/22 00:37:24 dtucker Exp $ # Placed in the Public Domain. tid="sshd config parse" -# This is a reasonable proxy for IPv6 support. -if ! config_defined HAVE_STRUCT_IN6_ADDR ; then - SKIP_IPV6=yes -fi - # We need to use the keys generated for the regression test because sshd -T # will fail if we're not running with SUDO (no permissions for real keys) or # if we are running tests on a system that has never had sshd installed @@ -28,49 +23,54 @@ verbose "reparse regress config" $SUDO ${SSHD} -T -f $OBJ/sshd_config.1 >$OBJ/sshd_config.2 && diff $OBJ/sshd_config.1 $OBJ/sshd_config.2) || fail "reparse regress config" +# Detect IPv6 support and if found, define variables for the needed +# config lines. This allows tests to also work on Portable platforms +# lacking IPv6 support without having diffs that make syncs harder. +if $SUDO ${SSHD} -tq -f $OBJ/sshd_config_minimal -oListenAddress=::1 ; then + trace "IPv6 support detected" + LISTENADDRESS_IPV6_LOOPBACK="listenaddress ::1" + LISTENADDRESS_IPV6_LOOPBACK_1234="listenaddress [::1]:1234" + LISTENADDRESS_IPV6_LOOPBACK_5678="listenaddress [::1]:5678" +else + trace "IPv6 support NOT detected" +fi + verbose "listenaddress order" # expected output -cat > $OBJ/sshd_config.0 < $OBJ/sshd_config.0 <> $OBJ/sshd_config.0 < $OBJ/sshd_config.1 < $OBJ/sshd_config.1 <> $OBJ/sshd_config.1 <$OBJ/sshd_config.2 && - diff $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ + grep -i '^listenaddress ' >$OBJ/sshd_config.2 && + diff -i $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ fail "listenaddress order 1" + # test 2: listenaddress first cat > $OBJ/sshd_config.1 <> $OBJ/sshd_config.1 <$OBJ/sshd_config.2 && - diff $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ + grep -i '^ListenAddress ' >$OBJ/sshd_config.2 && + diff -i $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ fail "listenaddress order 2" # Check idempotence of MaxStartups @@ -82,8 +82,8 @@ MaxStartups 1:2:3 MaxStartups 8:16:32 EOD ($SUDO ${SSHD} -T -f $OBJ/sshd_config.1 | \ - grep '^maxstartups ' >$OBJ/sshd_config.2 && - diff $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ + grep -i '^maxstartups ' >$OBJ/sshd_config.2 && + diff -i $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ fail "maxstartups idempotence" # cleanup diff --git a/regress/channel-timeout.sh b/regress/channel-timeout.sh index 97708f2a2c9b..1dd02a721dfd 100644 --- a/regress/channel-timeout.sh +++ b/regress/channel-timeout.sh @@ -1,4 +1,4 @@ -# $OpenBSD: channel-timeout.sh,v 1.2 2024/01/09 22:19:36 djm Exp $ +# $OpenBSD: channel-timeout.sh,v 1.3 2026/07/21 06:18:23 djm Exp $ # Placed in the Public Domain. tid="channel timeout" @@ -47,6 +47,17 @@ if [ $r -ne 255 ]; then fail "ssh returned unexpected error code $r" fi +verbose "match command timeout" +(cat $OBJ/sshd_proxy.orig ; + echo "match user *" ; + echo "ChannelTimeout session:command=1") \ + > $OBJ/sshd_proxy +${SSH} -F $OBJ/ssh_proxy somehost "sleep 5 ; exit 23" +r=$? +if [ $r -ne 255 ]; then + fail "ssh returned unexpected error code $r" +fi + verbose "command long timeout" (cat $OBJ/sshd_proxy.orig ; echo "ChannelTimeout session:command=60") \ > $OBJ/sshd_proxy diff --git a/regress/ecdsa256_openssh.prv b/regress/ecdsa256_openssh.prv new file mode 100644 index 000000000000..47b94c815931 --- /dev/null +++ b/regress/ecdsa256_openssh.prv @@ -0,0 +1,8 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS +1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQ6jrM+3cAsaW9s1EQvnlIecMIu8QHo +jcOibC0VHnaMAifXV/2KGzUz/RCX8U46sa7ilmPu91Lbnw9URWeigfBVAAAAmI7jFK2O4x +StAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDqOsz7dwCxpb2zU +RC+eUh5wwi7xAeiNw6JsLRUedowCJ9dX/YobNTP9EJfxTjqxruKWY+73UtufD1RFZ6KB8F +UAAAAgU1l4gRkaM0BsXp/EaHL9G4ovVao4sQy81HPzu61BMq8AAAAA +-----END OPENSSH PRIVATE KEY----- diff --git a/regress/ecdsa256_openssh.pub b/regress/ecdsa256_openssh.pub new file mode 100644 index 000000000000..73ca40cfa582 --- /dev/null +++ b/regress/ecdsa256_openssh.pub @@ -0,0 +1 @@ +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDqOsz7dwCxpb2zURC+eUh5wwi7xAeiNw6JsLRUedowCJ9dX/YobNTP9EJfxTjqxruKWY+73UtufD1RFZ6KB8FU= diff --git a/regress/ecdsa384_openssh.prv b/regress/ecdsa384_openssh.prv new file mode 100644 index 000000000000..fa9b6982f442 --- /dev/null +++ b/regress/ecdsa384_openssh.prv @@ -0,0 +1,10 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAiAAAABNlY2RzYS +1zaGEyLW5pc3RwMzg0AAAACG5pc3RwMzg0AAAAYQQtRwcGddCQ0tt6PZBUJw8aoLayT0zg +hPuwuF6Pu2XDtD3gyUe0IG7C4AoFCBdfOpHq+zc2Crj9/MTvklThDEft4Pbgs7Mnsi20tV +76TvsZ/h2p7TbBPwAqp3RyEivq7TMAAADQXn/G1V5/xtUAAAATZWNkc2Etc2hhMi1uaXN0 +cDM4NAAAAAhuaXN0cDM4NAAAAGEELUcHBnXQkNLbej2QVCcPGqC2sk9M4IT7sLhej7tlw7 +Q94MlHtCBuwuAKBQgXXzqR6vs3Ngq4/fzE75JU4QxH7eD24LOzJ7IttLVe+k77Gf4dqe02 +wT8AKqd0chIr6u0zAAAAMQCy9lLIJKu0mSNMYvpi8c1Pql04WZ7likMirzjyboMFAOpo/x +fNaN7kaHNRE2lDWZcAAAAAAQIDBAUGBw== +-----END OPENSSH PRIVATE KEY----- diff --git a/regress/ecdsa384_openssh.pub b/regress/ecdsa384_openssh.pub new file mode 100644 index 000000000000..40fb1737428e --- /dev/null +++ b/regress/ecdsa384_openssh.pub @@ -0,0 +1 @@ +ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBC1HBwZ10JDS23o9kFQnDxqgtrJPTOCE+7C4Xo+7ZcO0PeDJR7QgbsLgCgUIF186ker7NzYKuP38xO+SVOEMR+3g9uCzsyeyLbS1XvpO+xn+HantNsE/ACqndHISK+rtMw== diff --git a/regress/ecdsa521_openssh.prv b/regress/ecdsa521_openssh.prv new file mode 100644 index 000000000000..533074246336 --- /dev/null +++ b/regress/ecdsa521_openssh.prv @@ -0,0 +1,12 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAArAAAABNlY2RzYS +1zaGEyLW5pc3RwNTIxAAAACG5pc3RwNTIxAAAAhQQBQtMWq99Otw8xIvYCOZ5H3FSbhMBg +JYgBRZV7kDA+fRhdl4oufhs1bZCsW9sHi7AAfuEzVHZeHKJCN399U3zJZaQBqXToX5k339 +H2yIdFPiMeANZDka4V6OcfhvMQoKnXAjGM02TmKZbSI7o/+dKYNtfry42a74POYt3ap1HF +En/2QF0AAAEADdHzuw3R87sAAAATZWNkc2Etc2hhMi1uaXN0cDUyMQAAAAhuaXN0cDUyMQ +AAAIUEAULTFqvfTrcPMSL2AjmeR9xUm4TAYCWIAUWVe5AwPn0YXZeKLn4bNW2QrFvbB4uw +AH7hM1R2XhyiQjd/fVN8yWWkAal06F+ZN9/R9siHRT4jHgDWQ5GuFejnH4bzEKCp1wIxjN +Nk5imW0iO6P/nSmDbX68uNmu+DzmLd2qdRxRJ/9kBdAAAAQgE8QNeKcFVXfiM8t83p+J/0 +yOHixM0Nqe0FhzeIHqHB+6QMu3oiz45oZcYxTg5Wvz8y27YkhWRmwXwFXkn07tgWCwAAAA +ABAg== +-----END OPENSSH PRIVATE KEY----- diff --git a/regress/ecdsa521_openssh.pub b/regress/ecdsa521_openssh.pub new file mode 100644 index 000000000000..b386dfe1ab4f --- /dev/null +++ b/regress/ecdsa521_openssh.pub @@ -0,0 +1 @@ +ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFC0xar3063DzEi9gI5nkfcVJuEwGAliAFFlXuQMD59GF2Xii5+GzVtkKxb2weLsAB+4TNUdl4cokI3f31TfMllpAGpdOhfmTff0fbIh0U+Ix4A1kORrhXo5x+G8xCgqdcCMYzTZOYpltIjuj/50pg21+vLjZrvg85i3dqnUcUSf/ZAXQ== diff --git a/regress/integrity.sh b/regress/integrity.sh index a13b56a38b43..97f0c61fb86a 100644 --- a/regress/integrity.sh +++ b/regress/integrity.sh @@ -4,9 +4,9 @@ tid="integrity" cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak -# start at byte 2900 (i.e. after kex) and corrupt at different offsets +# start at byte 4500 (i.e. after kex) and corrupt at different offsets tries=10 -startoffset=2900 +startoffset=3500 macs=`${SSH} -Q mac` # The following are not MACs, but ciphers with integrated integrity. They are diff --git a/regress/keyscan.sh b/regress/keyscan.sh index 411c8222fdab..539d80c7fe83 100644 --- a/regress/keyscan.sh +++ b/regress/keyscan.sh @@ -1,4 +1,4 @@ -# $OpenBSD: keyscan.sh,v 1.14 2026/04/27 05:49:41 dtucker Exp $ +# $OpenBSD: keyscan.sh,v 1.15 2026/08/10 23:28:15 djm Exp $ # Placed in the Public Domain. tid="keyscan" @@ -25,3 +25,40 @@ for t in $SSH_KEYTYPES; do fail "ssh-keyscan -t $t failed with: $r" fi done + +trace "keyscan timeout for partial pre-KEX banner" +keyscan_port=`expr $PORT + 1` +keyscan_server_log=$OBJ/keyscan-server.log +(printf x; sleep 5) | \ + $NC -l 127.0.0.1 $keyscan_port >$keyscan_server_log 2>&1 & +keyscan_server_pid=$! +sleep 1 +if ! kill -0 $keyscan_server_pid >/dev/null 2>&1; then + wait $keyscan_server_pid + fatal "keyscan test server failed to start" +fi +${SSHKEYSCAN} -t ed25519 -T 1 -p $keyscan_port 127.0.0.1 \ + >/dev/null 2>&1 & +keyscan_pid=$! +i=0 +while kill -0 $keyscan_pid >/dev/null 2>&1 && test $i -lt 10; do + sleep 1 + i=`expr $i + 1` +done +if kill -0 $keyscan_pid >/dev/null 2>&1; then + kill $keyscan_pid >/dev/null 2>&1 + wait $keyscan_pid + r=0 +else + wait $keyscan_pid + r=$? +fi +kill $keyscan_server_pid >/dev/null 2>&1 +wait $keyscan_server_pid +if ! grep "OpenSSH-keyscan" $keyscan_server_log >/dev/null 2>&1; then + fail "ssh-keyscan did not connect to partial banner server" +elif test $r -eq 0; then + fail "ssh-keyscan did not enforce timeout for partial banner" +elif test $r -ne 1; then + fail "ssh-keyscan partial banner returned unexpected status: $r" +fi diff --git a/regress/misc/sk-dummy/sk-dummy.c b/regress/misc/sk-dummy/sk-dummy.c index 4c96e8827c50..cbbba7459db9 100644 --- a/regress/misc/sk-dummy/sk-dummy.c +++ b/regress/misc/sk-dummy/sk-dummy.c @@ -89,7 +89,7 @@ sk_api_version(void) static int pack_key_ecdsa(struct sk_enroll_response *response) { -#ifdef OPENSSL_HAS_ECC +#ifdef WITH_OPENSSL EC_KEY *key = NULL; const EC_GROUP *g; const EC_POINT *q; @@ -309,7 +309,7 @@ sig_ecdsa(const uint8_t *message, size_t message_len, const uint8_t *key_handle, size_t key_handle_len, struct sk_sign_response *response) { -#ifdef OPENSSL_HAS_ECC +#ifdef WITH_OPENSSL ECDSA_SIG *sig = NULL; const BIGNUM *sig_r, *sig_s; int ret = -1; diff --git a/regress/pubkey-priority.sh b/regress/pubkey-priority.sh new file mode 100644 index 000000000000..d4f9018eee79 --- /dev/null +++ b/regress/pubkey-priority.sh @@ -0,0 +1,120 @@ +# $OpenBSD: pubkey-priority.sh,v 1.2 2026/08/03 23:22:23 dtucker Exp $ +# Placed in the Public Domain. + +tid="public key priority and ordering" + +rm -f $OBJ/ca_key* $OBJ/explicit_agent* $OBJ/explicit_fs* \ + $OBJ/agent_sk_notouch* $OBJ/agent_sk_verify* $OBJ/agent_normal_cert* \ + $OBJ/agent_plain* $OBJ/id_ed25519* + +trace "start agent" +eval `${SSHAGENT} ${EXTRA_AGENT_ARGS} -s` >/dev/null +r=$? +if [ $r -ne 0 ]; then + fatal "could not start ssh-agent: exit code $r" +fi + +# Generate CA +${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/ca_key || fatal "ca keygen failed" + +# 1. Explicit filesystem key +${SSHKEYGEN} -q -N '' -t ed25519 -C explicit_fs -f $OBJ/explicit_fs || fatal "keygen explicit_fs failed" + +# 2. Explicit agent key +${SSHKEYGEN} -q -N '' -t ed25519 -C explicit_agent -f $OBJ/explicit_agent || fatal "keygen explicit_agent failed" + +# 3. Implicit filesystem key (default id_ed25519) +${SSHKEYGEN} -q -N '' -t ed25519 -C implicit_fs -f $OBJ/id_ed25519 || fatal "keygen implicit failed" + +# 4. Agent plain key +${SSHKEYGEN} -q -N '' -t ed25519 -C agent_plain -f $OBJ/agent_plain || fatal "keygen agent_plain failed" + +# 5. Agent normal cert +${SSHKEYGEN} -q -N '' -t ed25519 -C agent_normal_cert -f $OBJ/agent_normal_cert || fatal "keygen agent_normal_cert failed" +${SSHKEYGEN} -qs $OBJ/ca_key -I "normal cert" -n estragon $OBJ/agent_normal_cert.pub || fatal "ca sign normal failed" + +# 6. Agent SK verify-required cert +${SSHKEYGEN} -q -N '' -t ed25519-sk -C agent_sk_verify -f $OBJ/agent_sk_verify || fatal "keygen agent_sk_verify failed" +${SSHKEYGEN} -qs $OBJ/ca_key -I "verify cert" -n estragon -O verify-required $OBJ/agent_sk_verify.pub || fatal "ca sign verify failed" + +# 7. Agent SK no-touch-required cert +${SSHKEYGEN} -q -N '' -t ed25519-sk -C agent_sk_notouch -f $OBJ/agent_sk_notouch || fatal "keygen agent_sk_notouch failed" +${SSHKEYGEN} -qs $OBJ/ca_key -I "notouch cert" -n estragon -O no-touch-required $OBJ/agent_sk_notouch.pub || fatal "ca sign notouch failed" + +# Load agent keys in reverse order of expected priority +${SSHADD} $OBJ/agent_plain >/dev/null 2>&1 || fatal "ssh-add agent_plain failed" +${SSHADD} $OBJ/agent_normal_cert >/dev/null 2>&1 || fatal "ssh-add agent_normal_cert failed" +${SSHADD} $OBJ/agent_sk_verify >/dev/null 2>&1 || fatal "ssh-add agent_sk_verify failed" +${SSHADD} $OBJ/agent_sk_notouch >/dev/null 2>&1 || fatal "ssh-add agent_sk_notouch failed" +${SSHADD} $OBJ/explicit_agent >/dev/null 2>&1 || fatal "ssh-add explicit_agent failed" + +cat > $OBJ/ssh_config_prio < $OBJ/prio.out 2>&1 || fatal "ssh -Z failed" + +cat > $OBJ/prio.expected < $OBJ/prio.got +if ! cmp $OBJ/prio.expected $OBJ/prio.got >/dev/null 2>&1; then + diff -u $OBJ/prio.expected $OBJ/prio.got + fail "unexpected public key ordering" +fi + +trace "verify IdentitiesOnly ordering" +${SSH} -F $OBJ/ssh_config_prio -oIdentitiesOnly=yes -Z test > $OBJ/prio_identities.out 2>&1 || fatal "ssh -Z IdentitiesOnly failed" + +cat > $OBJ/prio_identities.expected < $OBJ/prio_identities.got +if ! cmp $OBJ/prio_identities.expected $OBJ/prio_identities.got >/dev/null 2>&1; then + diff -u $OBJ/prio_identities.expected $OBJ/prio_identities.got + fail "unexpected IdentitiesOnly public key ordering" +fi + +trace "verify implicit key ordering" +HOME=$OBJ ${SSH} -F /dev/null -Z test > $OBJ/prio_implicit.out 2>&1 || fatal "ssh -Z implicit failed" + +cat > $OBJ/prio_implicit.expected < $OBJ/prio_implicit.got +if ! cmp $OBJ/prio_implicit.expected $OBJ/prio_implicit.got >/dev/null 2>&1; then + diff -u $OBJ/prio_implicit.expected $OBJ/prio_implicit.got + fail "unexpected implicit public key ordering" +fi + +trace "kill agent" +${SSHAGENT} -k >/dev/null diff --git a/regress/rekey.sh b/regress/rekey.sh index 8e1a84888187..58a71f7e6e28 100644 --- a/regress/rekey.sh +++ b/regress/rekey.sh @@ -1,4 +1,4 @@ -# $OpenBSD: rekey.sh,v 1.30 2024/08/28 12:08:26 djm Exp $ +# $OpenBSD: rekey.sh,v 1.31 2026/07/21 06:18:09 djm Exp $ # Placed in the Public Domain. tid="rekey" @@ -73,7 +73,7 @@ increase_datafile_size 300 opts="" # Filter out duplicate curve algo -kexs=`${SSH} -Q kex | grep -v curve25519-sha256@libssh.org` +kexs=`${SSH} -Q kex | grep -v curve25519-sha256@libssh.org | grep -v sntrup761x25519-sha512@openssh.com` ciphers=`${SSH} -Q cipher` # HPN-SSH enables the none MAC but this fails @@ -164,6 +164,26 @@ for s in 16 1k 128k 256k; do fi done +for s in 16 1k 128k 256k; do + verbose "server match rekeylimit ${s}" + cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy + echo "match user *" >>$OBJ/sshd_proxy + echo "rekeylimit ${s}" >>$OBJ/sshd_proxy + rm -f ${COPY} ${COPY2} ${LOG} + dd if=${DATA} of=${COPY} bs=$s count=1 2>/dev/null + ${SSH} -F $OBJ/ssh_proxy somehost "cat ${COPY}" >${COPY2} + if [ $? -ne 0 ]; then + fail "ssh failed" + fi + cmp ${COPY} ${COPY2} || fail "corrupted copy" + n=`grep 'NEWKEYS sent' ${LOG} | wc -l` + n=`expr $n - 1` + trace "$n rekeying(s)" + if [ $n -lt 1 ]; then + fail "no rekeying occurred" + fi +done + for s in 5 10; do verbose "server rekeylimit default ${s} no data" cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy diff --git a/regress/sshfp-connect.sh b/regress/sshfp-connect.sh index 3c73a35d05dd..7cfef3768a2c 100644 --- a/regress/sshfp-connect.sh +++ b/regress/sshfp-connect.sh @@ -1,39 +1,89 @@ -# $OpenBSD: sshfp-connect.sh,v 1.5 2025/03/11 11:46:44 dtucker Exp $ +# $OpenBSD: sshfp-connect.sh,v 1.9 2026/07/16 09:07:18 dtucker Exp $ # Placed in the Public Domain. # This test requires external setup and thus is skipped unless # TEST_SSH_SSHFP_DOMAIN is set. It requires: -# 1) A DNSSEC-enabled domain, which TEST_SSH_SSHFP_DOMAIN points to. -# 2) A DNSSEC-validating resolver such as unwind(8). -# 3) The following SSHFP records with fingerprints from rsa_openssh.pub -# in that domain that are expected to succeed: -# sshtest: valid sha1 and sha256 fingerprints. -# sshtest-sha{1,256}, : valid fingerprints for that type only. +# 1) A DNSSEC-validating resolver such as unwind(8). +# 2) A DNSSEC-enabled domain, which TEST_SSH_SSHFP_DOMAIN points to, +# containing he following SSHFP records with fingerprints from +# rsa_openssh.pub in that domain that are expected to succeed: +# rsa: valid sha1 and sha256 fingerprints. +# rsa-sha{1,256}: valid fingerprints for that type only. # and the following records that are expected to fail: -# sshtest-bad: invalid sha1 fingerprint and good sha256 fingerprint -# sshtest-sha{1,256}-bad: invalid fingerprints for that type only. -# -# sshtest IN SSHFP 1 1 99C79CC09F5F81069CC017CDF9552CFC94B3B929 -# sshtest IN SSHFP 1 2 E30D6B9EB7A4DE495324E4D5870B8220577993EA6AF417E8E4A4F1C5 BF01A9B6 -# sshtest-sha1 IN SSHFP 1 1 99C79CC09F5F81069CC017CDF9552CFC94B3B929 -# sshtest-sha256 IN SSHFP 1 2 E30D6B9EB7A4DE495324E4D5870B8220577993EA6AF417E8E4A4F1C5 BF01A9B6 -# sshtest-bad IN SSHFP 1 2 E30D6B9EB7A4DE495324E4D5870B8220577993EA6AF417E8E4A4F1C5 BF01A9B6 -# sshtest-bad IN SSHFP 1 1 99C79CC09F5F81069CC017CDF9552CFC94B3B928 -# sshtest-sha1-bad IN SSHFP 1 1 99D79CC09F5F81069CC017CDF9552CFC94B3B929 -# sshtest-sha256-bad IN SSHFP 1 2 E30D6B9EB7A4DE495324E4D5870B8220577993EA6AF417E8E4A4F1C5 BF01A9B5 +# rsa-bad: invalid sha1 fingerprint and good sha256 fingerprint +# rsa-sha{1,256}-bad: invalid fingerprints for that type only. +# The SSHFP records for the other key types follow the same pattern. +# The BIND-format zone file $OBJ/sshfp-connect.zone is created +# containing these records. tid="sshfp connect" -if ! $SSH -Q key-plain | grep ssh-rsa >/dev/null; then - skip "RSA keys not supported." -elif [ -z "${TEST_SSH_SSHFP_DOMAIN}" ]; then +if [ -z "${TEST_SSH_SSHFP_DOMAIN}" ]; then skip "TEST_SSH_SSHFP_DOMAIN not set." -else - # Prime any DNS caches and resolvers. - for i in sshtest sshtest-sha1 sshtest-sha256; do - host -t sshfp ${i}.${TEST_SSH_SSHFP_DOMAIN} >/dev/null 2>&1 - host -t sshfp ${i}-bad.${TEST_SSH_SSHFP_DOMAIN} >/dev/null 2>&1 - done +fi + +# Generate expected SSHFP zone file. This can also be handy to import if +# you're setting this up from scratch. +for kt in `$SSH -Q key-plain | grep -v sk- | \ + egrep '^(ssh-rsa|ecdsa-sha2|ssh-ed25519)'`; do + case "$kt" in + ssh-rsa) dnsname=rsa ;; + ecdsa-sha2-nistp256) dnsname=ecdsa256 ;; + ecdsa-sha2-nistp384) dnsname=ecdsa384 ;; + ecdsa-sha2-nistp521) dnsname=ecdsa521 ;; + ssh-ed25519) dnsname=ed25519 ;; + *) fatal "unknown keytype $kt" ;; + esac + file="${dnsname}_openssh" + # Make good fingerprints + $SSHKEYGEN -r ${dnsname} -f ${SRC}/${file}.pub + $SSHKEYGEN -r ${dnsname}-sha1 -f ${SRC}/${file}.pub -Ohashalg=sha1 + $SSHKEYGEN -r ${dnsname}-sha256 -f ${SRC}/${file}.pub -Ohashalg=sha256 + # Make bad fingerprints. + # For the name with both types we only want the sha1 to be bad. + $SSHKEYGEN -r ${dnsname}-bad -f ${SRC}/${file}.pub -Ohashalg=sha1 | tr f e + $SSHKEYGEN -r ${dnsname}-bad -f ${SRC}/${file}.pub -Ohashalg=sha256 + $SSHKEYGEN -r ${dnsname}-sha1-bad -f ${SRC}/${file}.pub -Ohashalg=sha1 | tr f e + $SSHKEYGEN -r ${dnsname}-sha256-bad -f ${SRC}/${file}.pub -Ohashalg=sha256 | tr f e +done | sort -n -k4,5 > $OBJ/sshfp-connect.zone + +# Check that the required DNS entries exist. +# This also primes any DNS caches and resolvers. +while read line; do + name=`echo "$line" | awk '{print $1}'` + expected=`echo "$line" | awk '{print $4" "$5" "$6}' | tr a-z A-Z` + # Ensure at least one result matches exactly + matched=no + + # This uses a here document instead of "foo | while read" since the + # the latter runs the loop inside a subshell and any variables set + # vanish when the subshell does. + while read result; do + if [ "$result" = "$expected" ]; then + matched=yes + fi + done < '$expected'" +done <${OBJ}/sshfp-connect.zone +verbose "all required sshfp entries exist" + +# Zero out known hosts and key aliases to force use of SSHFP records. +> $OBJ/known_hosts +mv $OBJ/ssh_proxy $OBJ/ssh_proxy.orig +sed -e "/HostKeyAlias.*localhost-with-alias/d" \ + -e "/Hostname.*127.0.0.1/d" \ + $OBJ/ssh_proxy.orig > $OBJ/ssh_proxy + +opts="-F $OBJ/ssh_proxy -oVerifyHostKeyDNS=yes" + +if $SSH -Q key-plain | grep ssh-rsa >/dev/null; then + verbose "connect sshfp rsa" # Set RSA host key to match fingerprints above. mv $OBJ/sshd_proxy $OBJ/sshd_proxy.orig @@ -42,22 +92,75 @@ else sed -e "s|$OBJ/ssh-rsa|$OBJ/host.ssh-rsa|" \ $OBJ/sshd_proxy.orig > $OBJ/sshd_proxy - # Zero out known hosts and key aliases to force use of SSHFP records. - > $OBJ/known_hosts - mv $OBJ/ssh_proxy $OBJ/ssh_proxy.orig - sed -e "/HostKeyAlias.*localhost-with-alias/d" \ - -e "/Hostname.*127.0.0.1/d" \ - $OBJ/ssh_proxy.orig > $OBJ/ssh_proxy + for n in rsa rsa-sha1 rsa-sha256; do + trace "sshfp connect $n good fingerprint" + algs="$opts -oHostKeyAlgorithms=rsa-sha2-512,rsa-sha2-256" + host="${n}.${TEST_SSH_SSHFP_DOMAIN}" + SSH_CONNECTION=`${SSH} $opts $algs $host 'echo $SSH_CONNECTION'` + if [ $? -ne 0 ]; then + fail "ssh sshfp connect $n failed" + fi + if [ "$SSH_CONNECTION" != "UNKNOWN 65535 UNKNOWN 65535" ]; then + fail "bad SSH_CONNECTION: $SSH_CONNECTION" + fi + + trace "sshfp connect $n bad fingerprint" + host="${n}-bad.${TEST_SSH_SSHFP_DOMAIN}" + if ${SSH} $opts $algs ${host} true 2>/dev/null; then + fail "sshfp-connect succeeded with bad SSHFP record" + fi + done +fi + +if $SSH -Q key-plain | grep ecdsa-sha2-nistp >/dev/null; then + for b in 256 384 521; do + verbose "connect sshfp ecdsa${b}" + + # Set ecdsa host key to match fingerprints above. + mv $OBJ/sshd_proxy $OBJ/sshd_proxy.orig + $SUDO cp $SRC/ecdsa${b}_openssh.prv $OBJ/host.ecdsa-sha2-nistp${b} + $SUDO chmod 600 $OBJ/host.ecdsa-sha2-nistp${b} + sed -e "s|$OBJ/ecdsa-sha2-nistp${b}|$OBJ/host.ecdsa-sha2-nistp${b}|" \ + $OBJ/sshd_proxy.orig > $OBJ/sshd_proxy + + for n in ecdsa${b} ecdsa${b}-sha1 ecdsa${b}-sha256; do + trace "sshfp connect $n good fingerprint" + algs="$opts -oHostKeyAlgorithms=ecdsa-sha2-nistp${b}" + host="${n}.${TEST_SSH_SSHFP_DOMAIN}" + SSH_CONNECTION=`${SSH} $opts $algs $host 'echo $SSH_CONNECTION'` + if [ $? -ne 0 ]; then + fail "ssh sshfp connect $n failed" + fi + if [ "$SSH_CONNECTION" != "UNKNOWN 65535 UNKNOWN 65535" ]; then + fail "bad SSH_CONNECTION: $SSH_CONNECTION" + fi + + trace "sshfp connect $n bad fingerprint" + host="${n}-bad.${TEST_SSH_SSHFP_DOMAIN}" + if ${SSH} $opts $algs ${host} true 2>/dev/null; then + fail "sshfp-connect succeeded with bad SSHFP record" + fi + done + done +fi + +if $SSH -Q key-plain | grep ssh-ed25519 >/dev/null; then + verbose "connect sshfp ed25519" + + # Set ed25519 host key to match fingerprints above. + mv $OBJ/sshd_proxy $OBJ/sshd_proxy.orig + $SUDO cp $SRC/ed25519_openssh.prv $OBJ/host.ssh-ed25519 + $SUDO chmod 600 $OBJ/host.ssh-ed25519 + sed -e "s|$OBJ/ssh-ed25519|$OBJ/host.ssh-ed25519|" \ + $OBJ/sshd_proxy.orig > $OBJ/sshd_proxy - for n in sshtest sshtest-sha1 sshtest-sha256; do + for n in ed25519 ed25519-sha1 ed25519-sha256; do trace "sshfp connect $n good fingerprint" - host="${n}.dtucker.net" - opts="-F $OBJ/ssh_proxy -o VerifyHostKeyDNS=yes " - opts="$opts -o HostKeyAlgorithms=rsa-sha2-512,rsa-sha2-256" + algs="$opts -oHostKeyAlgorithms=ssh-ed25519" host="${n}.${TEST_SSH_SSHFP_DOMAIN}" - SSH_CONNECTION=`${SSH} $opts $host 'echo $SSH_CONNECTION'` + SSH_CONNECTION=`${SSH} $opts $algs $host 'echo $SSH_CONNECTION'` if [ $? -ne 0 ]; then - fail "ssh sshfp connect failed" + fail "ssh sshfp connect $n failed" fi if [ "$SSH_CONNECTION" != "UNKNOWN 65535 UNKNOWN 65535" ]; then fail "bad SSH_CONNECTION: $SSH_CONNECTION" @@ -65,7 +168,7 @@ else trace "sshfp connect $n bad fingerprint" host="${n}-bad.${TEST_SSH_SSHFP_DOMAIN}" - if ${SSH} $opts ${host} true; then + if ${SSH} $opts $algs ${host} true 2>/dev/null; then fail "sshfp-connect succeeded with bad SSHFP record" fi done diff --git a/regress/unittests/bitmap/tests.c b/regress/unittests/bitmap/tests.c index 6470f983d447..e3bffadeae7b 100644 --- a/regress/unittests/bitmap/tests.c +++ b/regress/unittests/bitmap/tests.c @@ -138,9 +138,9 @@ tests(void) TEST_DONE(); #endif } + void benchmarks(void) { printf("no benchmarks\n"); } - diff --git a/regress/unittests/conversion/tests.c b/regress/unittests/conversion/tests.c index fce4d1ca7001..1c620e02d95c 100644 --- a/regress/unittests/conversion/tests.c +++ b/regress/unittests/conversion/tests.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "../test_helper/test_helper.h" diff --git a/regress/unittests/hostkeys/test_iterate.c b/regress/unittests/hostkeys/test_iterate.c index a330adce53a9..6281e30dfc7a 100644 --- a/regress/unittests/hostkeys/test_iterate.c +++ b/regress/unittests/hostkeys/test_iterate.c @@ -87,11 +87,6 @@ check(struct hostkey_foreach_line *l, void *_ctx) expected_keytype = (parse_key || expected->no_parse_keytype < 0) ? expected->l.keytype : expected->no_parse_keytype; -#ifndef OPENSSL_HAS_ECC - if (expected->l.keytype == KEY_ECDSA || - expected->no_parse_keytype == KEY_ECDSA) - skip = 1; -#endif /* OPENSSL_HAS_ECC */ #ifndef WITH_OPENSSL if (expected->l.keytype == KEY_RSA || expected->no_parse_keytype == KEY_RSA || @@ -147,10 +142,6 @@ prepare_expected(struct expected *expected, size_t n) for (i = 0; i < n; i++) { if (expected[i].key_file == NULL) continue; -#ifndef OPENSSL_HAS_ECC - if (expected[i].l.keytype == KEY_ECDSA) - continue; -#endif /* OPENSSL_HAS_ECC */ #ifndef WITH_OPENSSL switch (expected[i].l.keytype) { case KEY_RSA: diff --git a/regress/unittests/kex/Makefile b/regress/unittests/kex/Makefile index bf17468034eb..369a171007dd 100644 --- a/regress/unittests/kex/Makefile +++ b/regress/unittests/kex/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2026/06/14 04:08:06 djm Exp $ +# $OpenBSD: Makefile,v 1.23 2026/07/28 09:55:44 markus Exp $ PROG=test_kex SRCS=tests.c test_kex.c test_proposal.c @@ -27,6 +27,7 @@ SRCS+= smult_curve25519_ref.c SRCS+= kexgen.c SRCS+= kexsntrup761x25519.c SRCS+= kexmlkem768x25519.c +SRCS+= kexmlkem768ecdh.c SRCS+= sntrup761.c SRCS+= utf8.c diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c index 16c2f2dff975..89376f11524e 100644 --- a/regress/unittests/kex/test_kex.c +++ b/regress/unittests/kex/test_kex.c @@ -158,14 +158,12 @@ do_kex_with_key(char *kex, char *cipher, char *mac, #ifdef WITH_OPENSSL server2->kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server; server2->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server; - server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; server2->kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server; server2->kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server; server2->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server; -#ifdef OPENSSL_HAS_ECC + server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; + server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; server2->kex->kex[KEX_ECDH_SHA2] = kex_gen_server; -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ server2->kex->kex[KEX_C25519_SHA256] = kex_gen_server; server2->kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_server; @@ -183,9 +181,9 @@ do_kex_with_key(char *kex, char *cipher, char *mac, TEST_DONE(); TEST_START("cleanup"); + sshkey_free(public); if (key == NULL) sshkey_free(private); - sshkey_free(public); ssh_free(client); ssh_free(server); ssh_free(server2); @@ -219,9 +217,7 @@ do_kex(char *kex) #ifdef WITH_OPENSSL do_kex_with_key(kex, NULL, NULL, NULL, KEY_RSA, 2048); -# ifdef OPENSSL_HAS_ECC do_kex_with_key(kex, NULL, NULL, NULL, KEY_ECDSA, 256); -# endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ do_kex_with_key(kex, NULL, NULL, NULL, KEY_ED25519, 256); } @@ -231,11 +227,9 @@ kex_tests(void) { do_kex("curve25519-sha256"); #ifdef WITH_OPENSSL -#ifdef OPENSSL_HAS_ECC do_kex("ecdh-sha2-nistp256"); do_kex("ecdh-sha2-nistp384"); do_kex("ecdh-sha2-nistp521"); -#endif /* OPENSSL_HAS_ECC */ do_kex("diffie-hellman-group-exchange-sha256"); do_kex("diffie-hellman-group-exchange-sha1"); do_kex("diffie-hellman-group14-sha1"); diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c index 1d83ffd88d2e..4bd4afa2ba94 100644 --- a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c +++ b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c @@ -16,10 +16,8 @@ #include #include +#include #include -#ifdef OPENSSL_HAS_NISTP256 -# include -#endif #include "openbsd-compat/openssl-compat.h" #include "../test_helper/test_helper.h" @@ -32,7 +30,9 @@ void sshbuf_getput_crypto_tests(void) { struct sshbuf *p1; - BIGNUM *bn, *bn2; + const u_char *d; + size_t s; + BIGNUM *bn, *bn2, *bn_x, *bn_y; const char *hexbn1 = "0102030405060708090a0b0c0d0e0f10"; /* This one has MSB set to test bignum2 encoding negative-avoidance */ const char *hexbn2 = "f0e0d0c0b0a0908070605040302010007fff11"; @@ -45,10 +45,6 @@ sshbuf_getput_crypto_tests(void) 0x70, 0x60, 0x50, 0x40, 0x30, 0x20, 0x10, 0x00, 0x7f, 0xff, 0x11 }; -#if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) - const u_char *d; - size_t s; - BIGNUM *bn_x, *bn_y; int ec256_nid = NID_X9_62_prime256v1; char *ec256_x = "0C828004839D0106AA59575216191357" "34B451459DADB586677EF9DF55784999"; @@ -67,7 +63,6 @@ sshbuf_getput_crypto_tests(void) }; EC_KEY *eck; EC_POINT *ecp; -#endif int r; #define MKBN(b, bnn) \ @@ -221,7 +216,6 @@ sshbuf_getput_crypto_tests(void) sshbuf_free(p1); TEST_DONE(); -#if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) TEST_START("sshbuf_put_ec"); eck = EC_KEY_new_by_curve_name(ec256_nid); ASSERT_PTR_NE(eck, NULL); @@ -273,7 +267,6 @@ sshbuf_getput_crypto_tests(void) BN_free(bn); BN_free(bn2); TEST_DONE(); -#endif } #endif /* WITH_OPENSSL */ diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c index 7b2ffced385d..9b95b60bbd10 100644 --- a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c +++ b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c @@ -16,9 +16,7 @@ #ifdef WITH_OPENSSL #include #include -#ifdef OPENSSL_HAS_NISTP256 -# include -#endif +#include #endif #include "../test_helper/test_helper.h" @@ -33,9 +31,7 @@ attempt_parse_blob(u_char *blob, size_t len) struct sshbuf *p1; #ifdef WITH_OPENSSL BIGNUM *bn; -#if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) EC_KEY *eck; -#endif /* defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) */ #endif /* WITH_OPENSSL */ u_char *s; size_t l; @@ -59,12 +55,10 @@ attempt_parse_blob(u_char *blob, size_t len) bn = NULL; ASSERT_INT_EQ(sshbuf_get_bignum2(p1, &bn), 0); BN_clear_free(bn); -#if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) eck = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); ASSERT_PTR_NE(eck, NULL); ASSERT_INT_EQ(sshbuf_get_eckey(p1, eck), 0); EC_KEY_free(eck); -#endif /* defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) */ #endif /* WITH_OPENSSL */ sshbuf_free(p1); } diff --git a/regress/unittests/sshkey/common.c b/regress/unittests/sshkey/common.c index fa68e6d5b3ff..32144beab95e 100644 --- a/regress/unittests/sshkey/common.c +++ b/regress/unittests/sshkey/common.c @@ -18,11 +18,9 @@ #ifdef WITH_OPENSSL #include +#include #include #include -#ifdef OPENSSL_HAS_NISTP256 -# include -#endif /* OPENSSL_HAS_NISTP256 */ #endif /* WITH_OPENSSL */ #include "openbsd-compat/openssl-compat.h" diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c index 296e90e78722..f8fcc3abda52 100644 --- a/regress/unittests/sshkey/test_file.c +++ b/regress/unittests/sshkey/test_file.c @@ -18,11 +18,9 @@ #ifdef WITH_OPENSSL #include +#include #include #include -#ifdef OPENSSL_HAS_NISTP256 -# include -#endif /* OPENSSL_HAS_NISTP256 */ #endif /* WITH_OPENSSL */ #include "../test_helper/test_helper.h" @@ -162,7 +160,7 @@ sshkey_file_tests(void) sshkey_free(k1); -#ifdef OPENSSL_HAS_ECC + TEST_START("parse ECDSA from private"); buf = load_file("ecdsa_1"); ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0); @@ -262,7 +260,6 @@ sshkey_file_tests(void) TEST_DONE(); sshkey_free(k1); -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ TEST_START("parse Ed25519 from private"); @@ -396,7 +393,7 @@ sshkey_file_tests(void) sshkey_free(k1); #ifdef ENABLE_SK -#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) +#if defined(WITH_OPENSSL) TEST_START("parse ECDSA-SK from private"); buf = load_file("ecdsa_sk1"); ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0); diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c index fb178c1e4d15..0e5bdf748ea1 100644 --- a/regress/unittests/sshkey/test_fuzz.c +++ b/regress/unittests/sshkey/test_fuzz.c @@ -18,11 +18,9 @@ #ifdef WITH_OPENSSL #include +#include #include #include -#ifdef OPENSSL_HAS_NISTP256 -# include -#endif #endif #include "../test_helper/test_helper.h" @@ -160,7 +158,7 @@ sshkey_fuzz_tests(void) fuzz_cleanup(fuzz); TEST_DONE(); -#ifdef OPENSSL_HAS_ECC + TEST_START("fuzz ECDSA private"); buf = load_file("ecdsa_1"); fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf), @@ -204,7 +202,6 @@ sshkey_fuzz_tests(void) sshbuf_free(fuzzed); fuzz_cleanup(fuzz); TEST_DONE(); -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ TEST_START("fuzz Ed25519 private"); @@ -270,7 +267,7 @@ sshkey_fuzz_tests(void) sshkey_free(k1); TEST_DONE(); -#ifdef OPENSSL_HAS_ECC + TEST_START("fuzz ECDSA public"); buf = load_file("ecdsa_1"); ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0); @@ -284,7 +281,6 @@ sshkey_fuzz_tests(void) public_fuzz(k1); sshkey_free(k1); TEST_DONE(); -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ TEST_START("fuzz Ed25519 public"); @@ -341,7 +337,7 @@ sshkey_fuzz_tests(void) sshkey_free(k1); TEST_DONE(); -#ifdef OPENSSL_HAS_ECC + TEST_START("fuzz ECDSA sig"); buf = load_file("ecdsa_1"); ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0); @@ -349,7 +345,6 @@ sshkey_fuzz_tests(void) sig_fuzz(k1, NULL); sshkey_free(k1); TEST_DONE(); -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ TEST_START("fuzz Ed25519 sig"); diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c index ec0ce452c751..59efbb28e6b3 100644 --- a/regress/unittests/sshkey/test_sshkey.c +++ b/regress/unittests/sshkey/test_sshkey.c @@ -15,10 +15,8 @@ #ifdef WITH_OPENSSL #include +#include #include -#if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) -# include -#endif #endif #include "../test_helper/test_helper.h" @@ -240,13 +238,8 @@ get_private(const char *n) void sshkey_tests(void) { - struct sshkey *k1 = NULL, *k2 = NULL, *k3 = NULL, *kf = NULL; -#ifdef WITH_OPENSSL - struct sshkey *k4 = NULL, *kr = NULL, *kd = NULL; -#ifdef OPENSSL_HAS_ECC - struct sshkey *ke = NULL; -#endif /* OPENSSL_HAS_ECC */ -#endif /* WITH_OPENSSL */ + struct sshkey *k1 = NULL, *k2 = NULL, *k3 = NULL, *k4 = NULL; + struct sshkey *kr = NULL, *kd = NULL, *ke = NULL, *kf = NULL; struct sshbuf *b = NULL; TEST_START("new invalid"); @@ -270,8 +263,6 @@ sshkey_tests(void) k1 = NULL; TEST_DONE(); - -#ifdef OPENSSL_HAS_ECC TEST_START("new/free KEY_ECDSA"); k1 = sshkey_new(KEY_ECDSA); ASSERT_PTR_NE(k1, NULL); @@ -279,7 +270,7 @@ sshkey_tests(void) sshkey_free(k1); k1 = NULL; TEST_DONE(); -#endif +#endif /* WITH_OPENSSL */ TEST_START("new/free KEY_ED25519"); k1 = sshkey_new(KEY_ED25519); @@ -300,6 +291,7 @@ sshkey_tests(void) k1 = NULL; TEST_DONE(); +#ifdef WITH_OPENSSL TEST_START("generate KEY_RSA too small modulus"); ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 128, &k1), SSH_ERR_KEY_LENGTH); @@ -313,7 +305,6 @@ sshkey_tests(void) TEST_DONE(); -#ifdef OPENSSL_HAS_ECC TEST_START("generate KEY_ECDSA wrong bits"); ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 42, &k1), SSH_ERR_KEY_LENGTH); @@ -321,7 +312,6 @@ sshkey_tests(void) sshkey_free(k1); k1 = NULL; TEST_DONE(); -#endif TEST_START("generate KEY_RSA"); ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 767, &kr), @@ -336,7 +326,6 @@ sshkey_tests(void) TEST_DONE(); -#ifdef OPENSSL_HAS_ECC TEST_START("generate KEY_ECDSA"); ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 256, &ke), 0); ASSERT_PTR_NE(ke, NULL); @@ -346,7 +335,6 @@ sshkey_tests(void) ASSERT_PTR_NE(EC_KEY_get0_private_key(EVP_PKEY_get0_EC_KEY(ke->pkey)), NULL); TEST_DONE(); -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ TEST_START("generate KEY_ED25519"); @@ -386,7 +374,6 @@ sshkey_tests(void) TEST_DONE(); -#ifdef OPENSSL_HAS_ECC TEST_START("demote KEY_ECDSA"); ASSERT_INT_EQ(sshkey_from_private(ke, &k1), 0); ASSERT_PTR_NE(k1, NULL); @@ -405,7 +392,6 @@ sshkey_tests(void) sshkey_free(k1); k1 = NULL; TEST_DONE(); -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ TEST_START("demote KEY_ED25519"); @@ -443,28 +429,21 @@ sshkey_tests(void) #ifdef WITH_OPENSSL TEST_START("equal mismatched key types"); ASSERT_INT_EQ(sshkey_equal(kd, kr), 0); -#ifdef OPENSSL_HAS_ECC ASSERT_INT_EQ(sshkey_equal(kd, ke), 0); ASSERT_INT_EQ(sshkey_equal(kr, ke), 0); ASSERT_INT_EQ(sshkey_equal(ke, kf), 0); -#endif /* OPENSSL_HAS_ECC */ ASSERT_INT_EQ(sshkey_equal(kd, kf), 0); TEST_DONE(); -#endif /* WITH_OPENSSL */ TEST_START("equal different keys"); -#ifdef WITH_OPENSSL ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &k1), 0); ASSERT_INT_EQ(sshkey_equal(kr, k1), 0); sshkey_free(k1); k1 = NULL; -#ifdef OPENSSL_HAS_ECC ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 256, &k1), 0); ASSERT_INT_EQ(sshkey_equal(ke, k1), 0); sshkey_free(k1); k1 = NULL; -#endif /* OPENSSL_HAS_ECC */ -#endif /* WITH_OPENSSL */ ASSERT_INT_EQ(sshkey_generate(KEY_ED25519, 256, &k1), 0); ASSERT_INT_EQ(sshkey_equal(kf, k1), 0); sshkey_free(k1); @@ -476,15 +455,13 @@ sshkey_tests(void) sshkey_free(k2); k1 = k2 = NULL; TEST_DONE(); +#endif /* WITH_OPENSSL */ -#ifdef WITH_OPENSSL sshkey_free(kr); sshkey_free(kd); -#ifdef OPENSSL_HAS_ECC sshkey_free(ke); -#endif /* OPENSSL_HAS_ECC */ -#endif /* WITH_OPENSSL */ sshkey_free(kf); + kr = kd = ke = kf = NULL; TEST_START("certify key"); ASSERT_INT_EQ(sshkey_load_public(test_data_file("ed25519_1.pub"), @@ -611,7 +588,6 @@ sshkey_tests(void) TEST_DONE(); -#ifdef OPENSSL_HAS_ECC TEST_START("sign and verify ECDSA"); k1 = get_private("ecdsa_1"); ASSERT_INT_EQ(sshkey_load_public(test_data_file("ecdsa_2.pub"), &k2, @@ -621,7 +597,6 @@ sshkey_tests(void) sshkey_free(k2); k1 = k2 = NULL; TEST_DONE(); -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ TEST_START("sign and verify ED25519"); diff --git a/regress/unittests/sshsig/tests.c b/regress/unittests/sshsig/tests.c index 68e893147635..fa30135331e0 100644 --- a/regress/unittests/sshsig/tests.c +++ b/regress/unittests/sshsig/tests.c @@ -103,11 +103,9 @@ tests(void) TEST_DONE(); -#ifdef OPENSSL_HAS_ECC TEST_START("check ECDSA signature"); check_sig("ecdsa.pub", "ecdsa.sig", msg, namespace); TEST_DONE(); -#endif #endif TEST_START("check ED25519 signature"); @@ -119,7 +117,7 @@ tests(void) TEST_DONE(); #ifdef ENABLE_SK -#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) +#if defined(WITH_OPENSSL) TEST_START("check ECDSA-SK signature"); check_sig("ecdsa_sk.pub", "ecdsa_sk.sig", msg, namespace); TEST_DONE(); @@ -129,11 +127,11 @@ tests(void) check_sig("ed25519_sk.pub", "ed25519_sk.sig", msg, namespace); TEST_DONE(); -#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) +#if defined(WITH_OPENSSL) TEST_START("check ECDSA-SK webauthn signature"); check_sig("ecdsa_sk_webauthn.pub", "ecdsa_sk_webauthn.sig", msg, namespace); - TEST_DONE(); + TEST_DONE(); #endif #endif /* ENABLE_SK */ diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c index a2cb02d838cc..898732d3822a 100644 --- a/regress/unittests/test_helper/test_helper.c +++ b/regress/unittests/test_helper/test_helper.c @@ -22,7 +22,7 @@ #include #include #include - + #include #include #include @@ -59,7 +59,7 @@ #define BENCH_COLUMN_WIDTH 40 #define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) - + #define TEST_CHECK_INT(r, pred) do { \ switch (pred) { \ case TEST_EQ: \ diff --git a/scp.0 b/scp.0 new file mode 100644 index 000000000000..d95eb87aa355 --- /dev/null +++ b/scp.0 @@ -0,0 +1,273 @@ +SCP(1) General Commands Manual SCP(1) + +NAME + scp M-bM-^@M-^S OpenSSH secure file copy + +SYNOPSIS + scp [-346ABCOpqRrsTv] [-c cipher] [-D sftp_server_path] [-F ssh_config] + [-i identity_file] [-J destination] [-l limit] [-o ssh_option] + [-P port] [-S program] [-X sftp_option] source ... target + +DESCRIPTION + scp copies files between hosts on a network. + + scp uses the SFTP protocol over an ssh(1) connection for data transfer, + and uses the same authentication and provides the same security as a + login session. + + scp will ask for passwords or passphrases if they are needed for + authentication. + + The source and target may be specified as a local pathname, a remote host + with optional path in the form [user@]host:[path], or a URI in the form + scp://[user@]host[:port][/path]. Local file names can be made explicit + using absolute or relative pathnames to avoid scp treating file names + containing M-bM-^@M-^X:M-bM-^@M-^Y as host specifiers. + + When copying between two remote hosts, if the URI format is used, a port + cannot be specified on the target if the -R option is used. + + The options are as follows: + + -3 Copies between two remote hosts are transferred through the local + host. This mode is the default, but see also the -R option for + copying data directly between two remote hosts. Note that when + using the legacy SCP protocol (via the -O flag), this option + selects batch mode for the second host as scp cannot ask for + passwords or passphrases for both hosts. + + -4 Forces scp to use IPv4 addresses only. + + -6 Forces scp to use IPv6 addresses only. + + -A Allows forwarding of ssh-agent(1) to the remote system. The + default is not to forward an authentication agent. + + -B Selects batch mode (prevents asking for passwords or + passphrases). + + -C Compression enable. Passes the -C flag to ssh(1) to enable + compression. + + -c cipher + Selects the cipher to use for encrypting the data transfer. This + option is directly passed to ssh(1). + + -D sftp_server_path + Connect directly to a local SFTP server program rather than a + remote one via ssh(1). This option may be useful in debugging + the client and server. + + -F ssh_config + Specifies an alternative per-user configuration file for ssh. + This option is directly passed to ssh(1). + + -i identity_file + Selects the file from which the identity (private key) for public + key authentication is read. This option is directly passed to + ssh(1). + + -J destination + Connect to the target host by first making an scp connection to + the jump host described by destination and then establishing a + TCP forwarding to the ultimate destination from there. Multiple + jump hops may be specified separated by comma characters. This + is a shortcut to specify a ProxyJump configuration directive. + This option is directly passed to ssh(1). + + -l limit + Limits the used bandwidth, specified in Kbit/s. + + -O Use the legacy SCP protocol for file transfers instead of the + SFTP protocol. Forcing the use of the SCP protocol may be + necessary for servers that do not implement SFTP, for backwards- + compatibility for particular filename wildcard patterns and for + expanding paths with a M-bM-^@M-^X~M-bM-^@M-^Y prefix for older SFTP servers. + + -o ssh_option + Can be used to pass options to ssh in the format used in + ssh_config(5). This is useful for specifying options for which + there is no separate scp command-line flag. For full details of + the options listed below, and their possible values, see + ssh_config(5). + + AddKeysToAgent + AddressFamily + BatchMode + BindAddress + BindInterface + CASignatureAlgorithms + CanonicalDomains + CanonicalizeFallbackLocal + CanonicalizeHostname + CanonicalizeMaxDots + CanonicalizePermittedCNAMEs + CertificateFile + ChannelTimeout + CheckHostIP + Ciphers + ClearAllForwardings + Compression + ConnectTimeout + ConnectionAttempts + ControlMaster + ControlPath + ControlPersist + DynamicForward + EnableEscapeCommandline + EnableSSHKeysign + EscapeChar + ExitOnForwardFailure + FingerprintHash + ForkAfterAuthentication + ForwardAgent + ForwardX11 + ForwardX11Timeout + ForwardX11Trusted + GSSAPIAuthentication + GSSAPIDelegateCredentials + GatewayPorts + GlobalKnownHostsFile + HashKnownHosts + Host + HostKeyAlgorithms + HostKeyAlias + HostbasedAcceptedAlgorithms + HostbasedAuthentication + Hostname + IPQoS + IdentitiesOnly + IdentityAgent + IdentityFile + IgnoreUnknown + Include + KbdInteractiveAuthentication + KbdInteractiveDevices + KexAlgorithms + KnownHostsCommand + LocalCommand + LocalForward + LogLevel + LogVerbose + MACs + NoHostAuthenticationForLocalhost + NumberOfPasswordPrompts + ObscureKeystrokeTiming + PKCS11Provider + PasswordAuthentication + PermitLocalCommand + PermitRemoteOpen + Port + PreferredAuthentications + ProxyCommand + ProxyJump + ProxyUseFdpass + PubkeyAcceptedAlgorithms + PubkeyAuthentication + RekeyLimit + RemoteCommand + RemoteForward + RequestTTY + RequiredRSASize + RevokedHostKeys + SecurityKeyProvider + SendEnv + ServerAliveCountMax + ServerAliveInterval + SessionType + SetEnv + StdinNull + StreamLocalBindMask + StreamLocalBindUnlink + StrictHostKeyChecking + SyslogFacility + TCPKeepAlive + Tag + Tunnel + TunnelDevice + UpdateHostKeys + User + UserKnownHostsFile + VerifyHostKeyDNS + VisualHostKey + XAuthLocation + + -P port + Specifies the port to connect to on the remote host. Note that + this option is written with a capital M-bM-^@M-^XPM-bM-^@M-^Y, because -p is already + reserved for preserving the times and mode bits of the file. + + -p Preserves modification times, access times, and file mode bits + from the source file. + + -q Quiet mode: disables the progress meter as well as warning and + diagnostic messages from ssh(1). + + -R Copies between two remote hosts are transferred through the local + host by default. This option instead copies between two remote + hosts by connecting to the origin host and executing scp there. + This requires that scp running on the origin host can + authenticate to the destination host without requiring a + password. + + -r Recursively copy entire directories. Note that scp follows + symbolic links encountered in the tree traversal. + + -S program + Name of program to use for the encrypted connection. The program + must understand ssh(1) options. + + -T Disable strict filename checking. By default when copying files + from a remote host to a local directory scp checks that the + received filenames match those requested on the command-line to + prevent the remote end from sending unexpected or unwanted files. + Because of differences in how various operating systems and + shells interpret filename wildcards, these checks may cause + wanted files to be rejected. This option disables these checks + at the expense of fully trusting that the server will not send + unexpected filenames. + + -v Verbose mode. Causes scp and ssh(1) to print debugging messages + about their progress. This is helpful in debugging connection, + authentication, and configuration problems. + + -X sftp_option + Specify an option that controls aspects of SFTP protocol + behaviour. The valid options are: + + nrequests=value + Controls how many concurrent SFTP read or write requests + may be in progress at any point in time during a download + or upload. By default 64 requests may be active + concurrently. + + buffer=value + Controls the maximum buffer size for a single SFTP + read/write operation used during download or upload. By + default a 32KB buffer is used. + +EXIT STATUS + The scp utility exitsM-BM- 0 on success, andM-BM- >0 if an error occurs. + +SEE ALSO + sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), ssh_config(5), + sftp-server(8), sshd(8) + +HISTORY + scp is based on the rcp program in BSD source code from the Regents of + the University of California. + + Since OpenSSH 9.0, scp has used the SFTP protocol for transfers by + default. + +AUTHORS + Timo Rinne + Tatu Ylonen + +CAVEATS + The legacy SCP protocol (selected by the -O flag) requires execution of + the remote user's shell to perform glob(3) pattern matching. This + requires careful quoting of any characters that have special meaning to + the remote shell, such as quote characters. + +OpenBSD 8.0 October 4, 2025 SCP(1) diff --git a/servconf.c b/servconf.c index 4da80c72a673..9c144b617396 100644 --- a/servconf.c +++ b/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.450 2026/06/29 08:59:31 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.452 2026/07/11 11:16:47 naddy Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -314,10 +314,8 @@ fill_default_server_options(ServerOptions *options) /* fill default hostkeys */ servconf_add_hostkey("[default]", 0, options, _PATH_HOST_RSA_KEY_FILE, 0); -#ifdef OPENSSL_HAS_ECC servconf_add_hostkey("[default]", 0, options, _PATH_HOST_ECDSA_KEY_FILE, 0); -#endif servconf_add_hostkey("[default]", 0, options, _PATH_HOST_ED25519_KEY_FILE, 0); servconf_add_hostkey("[default]", 0, options, @@ -1467,19 +1465,19 @@ process_server_config_line_depth(ServerOptions *options, char *line, #endif /* KRB5 */ #ifdef GSSAPI - case sGssAuthentication: + case sGSSAPIAuthentication: intptr = &options->gss_authentication; goto parse_flag; - case sGssCleanupCreds: + case sGSSAPICleanupCredentials: intptr = &options->gss_cleanup_creds; goto parse_flag; - case sGssDelegateCreds: + case sGSSAPIDelegateCredentials: intptr = &options->gss_deleg_creds; goto parse_flag; - case sGssStrictAcceptor: + case sGSSAPIStrictAcceptorCheck: intptr = &options->gss_strict_acceptor; goto parse_flag; #endif /* GSSAPI */ @@ -4183,13 +4181,13 @@ format_listen_addrs(struct listenaddr *la) } laddr2 = laddr1; if (ai->ai_family == AF_INET6) { - xasprintf(&laddr1, "listenaddress [%s]:%s%s%s\n%s", + xasprintf(&laddr1, "ListenAddress [%s]:%s%s%s\n%s", addr, port, la->rdomain == NULL ? "" : " rdomain ", la->rdomain == NULL ? "" : la->rdomain, laddr2); } else { - xasprintf(&laddr1, "listenaddress %s:%s%s%s\n%s", + xasprintf(&laddr1, "ListenAddress %s:%s%s%s\n%s", addr, port, la->rdomain == NULL ? "" : " rdomain ", la->rdomain == NULL ? "" : la->rdomain, @@ -4208,7 +4206,7 @@ dump_config(ServerOptions *o) /* these are usually at the top of the config */ for (i = 0; i < o->num_ports; i++) - printf("port %d\n", o->ports[i]); + printf("Port %d\n", o->ports[i]); dump_cfg_fmtint(sAddressFamily, o->address_family); for (i = 0; i < o->num_listen_addrs; i++) { @@ -4249,10 +4247,10 @@ dump_config(ServerOptions *o) # endif #endif #ifdef GSSAPI - dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); - dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); - dump_cfg_fmtint(sGssDelegateCreds, o->gss_deleg_creds); - dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); + dump_cfg_fmtint(sGSSAPIAuthentication, o->gss_authentication); + dump_cfg_fmtint(sGSSAPICleanupCredentials, o->gss_cleanup_creds); + dump_cfg_fmtint(sGSSAPIDelegateCredentials, o->gss_deleg_creds); + dump_cfg_fmtint(sGSSAPIStrictAcceptorCheck, o->gss_strict_acceptor); #endif dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication); dump_cfg_fmtint(sKbdInteractiveAuthentication, @@ -4344,17 +4342,17 @@ dump_config(ServerOptions *o) /* other arguments */ for (i = 0; i < o->num_subsystems; i++) - printf("subsystem %s %s\n", o->subsystem_name[i], + printf("Subsystem %s %s\n", o->subsystem_name[i], o->subsystem_args[i]); - printf("maxstartups %d:%d:%d\n", o->max_startups_begin, + printf("MaxStartups %d:%d:%d\n", o->max_startups_begin, o->max_startups_rate, o->max_startups); - printf("persourcemaxstartups "); + printf("PerSourceMaxStartups "); if (o->per_source_max_startups == INT_MAX) printf("none\n"); else printf("%d\n", o->per_source_max_startups); - printf("persourcenetblocksize %d:%d\n", o->per_source_masklen_ipv4, + printf("PerSourceNetBlockSize %d:%d\n", o->per_source_masklen_ipv4, o->per_source_masklen_ipv6); s = NULL; @@ -4366,13 +4364,13 @@ dump_config(ServerOptions *o) } dump_cfg_string(sPermitTunnel, s); - printf("ipqos %s ", iptos2str(o->ip_qos_interactive)); + printf("IPQoS %s ", iptos2str(o->ip_qos_interactive)); printf("%s\n", iptos2str(o->ip_qos_bulk)); - printf("rekeylimit %llu %d\n", (unsigned long long)o->rekey_limit, + printf("RekeyLimit %llu %d\n", (unsigned long long)o->rekey_limit, o->rekey_interval); - printf("permitopen"); + printf("PermitOpen"); if (o->num_permitted_opens == 0) printf(" any"); else { @@ -4380,7 +4378,7 @@ dump_config(ServerOptions *o) printf(" %s", o->permitted_opens[i]); } printf("\n"); - printf("permitlisten"); + printf("PermitListen"); if (o->num_permitted_listens == 0) printf(" any"); else { @@ -4392,11 +4390,11 @@ dump_config(ServerOptions *o) if (o->permit_user_env_allowlist == NULL) { dump_cfg_fmtint(sPermitUserEnvironment, o->permit_user_env); } else { - printf("permituserenvironment %s\n", + printf("PermitUserEnvironment %s\n", o->permit_user_env_allowlist); } - printf("pubkeyauthoptions"); + printf("PubkeyAuthOptions"); if (o->pubkey_auth_options == 0) printf(" none"); if (o->pubkey_auth_options & PUBKEYAUTH_TOUCH_REQUIRED) @@ -4406,7 +4404,7 @@ dump_config(ServerOptions *o) printf("\n"); if (o->per_source_penalty.enabled) { - printf("persourcepenalties crash:%f authfail:%f noauth:%f " + printf("PerSourcePenalties crash:%f authfail:%f noauth:%f " "invaliduser:%f " "grace-exceeded:%f refuseconnection:%f max:%f min:%f " "max-sources4:%d max-sources6:%d " @@ -4428,5 +4426,5 @@ dump_config(ServerOptions *o) PER_SOURCE_PENALTY_OVERFLOW_DENY_ALL ? "deny-all" : "permissive"); } else - printf("persourcepenalties no\n"); + printf("PerSourcePenalties no\n"); } diff --git a/servconf.h b/servconf.h index 60feff30f9ee..e7b34135bf05 100644 --- a/servconf.h +++ b/servconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.177 2026/05/31 11:30:50 djm Exp $ */ +/* $OpenBSD: servconf.h,v 1.179 2026/07/07 01:00:22 djm Exp $ */ /* * Author: Tatu Ylonen @@ -282,11 +282,11 @@ SSHCONF_INTFLAG(use_mptcp, UseMPTCP, SSHCFG_GLOBAL, 0, SSHCFG_COPY_NONE) #ifdef USE_PAM #define SSHD_CONFIG_ENTRIES_PAM \ SSHCONF_INTFLAG(use_pam, UsePAM, SSHCFG_GLOBAL, 0, SSHCFG_COPY_NONE) \ -SSHCONF_STRING(pam_service_name, PAMServiceName, SSHCFG_GLOBAL, SSHCFG_COPY_NONE) +SSHCONF_STRING(pam_service_name, PAMServiceName, SSHCFG_ALL, SSHCFG_COPY_NONE) #else #define SSHD_CONFIG_ENTRIES_PAM \ SSHCONF_UNSUPPORTED_INT(use_pam, UsePAM, SSHCFG_GLOBAL) \ -SSHCONF_UNSUPPORTED_STRING(pam_service_name, PAMServiceName, SSHCFG_GLOBAL) +SSHCONF_UNSUPPORTED_STRING(pam_service_name, PAMServiceName, SSHCFG_ALL) #endif #ifdef DISABLE_LASTLOG @@ -323,16 +323,16 @@ SSHCONF_UNSUPPORTED_INT(kerberos_get_afs_token, KerberosGetAFSToken, SSHCFG_GLOB #ifdef GSSAPI #define SSHD_CONFIG_ENTRIES_GSS \ -SSHCONF_INTFLAG(gss_authentication, GssAuthentication, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) \ -SSHCONF_INTFLAG(gss_cleanup_creds, GssCleanupCreds, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \ -SSHCONF_INTFLAG(gss_deleg_creds, GssDelegateCreds, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \ -SSHCONF_INTFLAG(gss_strict_acceptor, GssStrictAcceptor, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) +SSHCONF_INTFLAG(gss_authentication, GSSAPIAuthentication, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) \ +SSHCONF_INTFLAG(gss_cleanup_creds, GSSAPICleanupCredentials, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \ +SSHCONF_INTFLAG(gss_deleg_creds, GSSAPIDelegateCredentials, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \ +SSHCONF_INTFLAG(gss_strict_acceptor, GSSAPIStrictAcceptorCheck, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) #else /* GSSAPI */ #define SSHD_CONFIG_ENTRIES_GSS \ -SSHCONF_UNSUPPORTED_INT(gss_authentication, GssAuthentication, SSHCFG_ALL) \ -SSHCONF_UNSUPPORTED_INT(gss_cleanup_creds, GssCleanupCreds, SSHCFG_GLOBAL) \ -SSHCONF_UNSUPPORTED_INT(gss_deleg_creds, GssDelegateCreds, SSHCFG_GLOBAL) \ -SSHCONF_UNSUPPORTED_INT(gss_strict_acceptor, GssStrictAcceptor, SSHCFG_GLOBAL) +SSHCONF_UNSUPPORTED_INT(gss_authentication, GSSAPIAuthentication, SSHCFG_ALL) \ +SSHCONF_UNSUPPORTED_INT(gss_cleanup_creds, GSSAPICleanupCredentials, SSHCFG_GLOBAL) \ +SSHCONF_UNSUPPORTED_INT(gss_deleg_creds, GSSAPIDelegateCredentials, SSHCFG_GLOBAL) \ +SSHCONF_UNSUPPORTED_INT(gss_strict_acceptor, GSSAPIStrictAcceptorCheck, SSHCFG_GLOBAL) #endif /* GSSAPI */ #define SSHD_CONFIG_ENTRIES \ diff --git a/serverloop.c b/serverloop.c index 91931fdf9313..4dbf6a2abe96 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.247 2026/05/31 04:47:29 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.248 2026/07/14 01:05:05 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -532,7 +532,8 @@ server_request_tun(struct ssh *ssh) ssh_packet_send_debug(ssh, "Unsupported tunnel device mode."); return NULL; } - if ((options.permit_tun & mode) == 0 || options.disable_forwarding) { + if ((options.permit_tun & mode) == 0 || options.disable_forwarding || + auth_opts->restricted) { ssh_packet_send_debug(ssh, "Server has rejected tunnel device " "forwarding"); return NULL; diff --git a/sftp-server.0 b/sftp-server.0 new file mode 100644 index 000000000000..440a17f8942e --- /dev/null +++ b/sftp-server.0 @@ -0,0 +1,102 @@ +SFTP-SERVER(8) System Manager's Manual SFTP-SERVER(8) + +NAME + sftp-server M-bM-^@M-^S OpenSSH SFTP server subsystem + +SYNOPSIS + sftp-server [-ehR] [-d start_directory] [-f log_facility] [-l log_level] + [-P denied_requests] [-p allowed_requests] [-u umask] + sftp-server -Q protocol_feature + +DESCRIPTION + sftp-server is a program that speaks the server side of SFTP protocol to + stdout and expects client requests from stdin. sftp-server is not + intended to be called directly, but from sshd(8) using the Subsystem + option. + + Command-line flags to sftp-server should be specified in the Subsystem + declaration. See sshd_config(5) for more information. + + Valid options are: + + -d start_directory + Specifies an alternate starting directory for users. The + pathname may contain the following tokens that are expanded at + runtime: %% is replaced by a literal '%', %d is replaced by the + home directory of the user being authenticated, and %u is + replaced by the username of that user. The default is to use the + user's home directory. This option is useful in conjunction with + the sshd_config(5) ChrootDirectory option. + + -e Causes sftp-server to print logging information to stderr instead + of syslog for debugging. + + -f log_facility + Specifies the facility code that is used when logging messages + from sftp-server. The possible values are: DAEMON, USER, AUTH, + LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. + The default is AUTH. + + -h Displays sftp-server usage information. + + -l log_level + Specifies which messages will be logged by sftp-server. The + possible values are: QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, + DEBUG1, DEBUG2, and DEBUG3. INFO and VERBOSE log transactions + that sftp-server performs on behalf of the client. DEBUG and + DEBUG1 are equivalent. DEBUG2 and DEBUG3 each specify higher + levels of debugging output. The default is ERROR. + + -P denied_requests + Specifies a comma-separated list of SFTP protocol requests that + are banned by the server. sftp-server will reply to any denied + request with a failure. The -Q flag can be used to determine the + supported request types. If both denied and allowed lists are + specified, then the denied list is applied before the allowed + list. This flag, along with the -p flag, may be used to disable + operations that are irrelevant or undesirable for the server. + For example, a sftp-server that accepts connections from + untrusted clients may wish to disable the M-bM-^@M-^\copy-dataM-bM-^@M-^] or + M-bM-^@M-^\users-groups-by-idM-bM-^@M-^] operations. + + -p allowed_requests + Specifies a comma-separated list of SFTP protocol requests that + are permitted by the server. All request types that are not on + the allowed list will be logged and replied to with a failure + message. + + Care must be taken when using this feature to ensure that + requests made implicitly by SFTP clients are permitted. + + -Q protocol_feature + Queries protocol features supported by sftp-server. At present + the only feature that may be queried is M-bM-^@M-^\requestsM-bM-^@M-^], which may be + used to deny or allow specific requests (flags -P and -p + respectively). + + -R Places this instance of sftp-server into a read-only mode. + Attempts to open files for writing, as well as other operations + that change the state of the filesystem, will be denied. + + -u umask + Sets an explicit umask(2) to be applied to newly-created files + and directories, instead of the user's default mask. + + On some systems, sftp-server must be able to access /dev/log for logging + to work, and use of sftp-server in a chroot configuration therefore + requires that syslogd(8) establish a logging socket inside the chroot + directory. + +SEE ALSO + sftp(1), ssh(1), sshd_config(5), sshd(8) + + T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh- + filexfer-02.txt, October 2001, work in progress material. + +HISTORY + sftp-server first appeared in OpenBSD 2.8. + +AUTHORS + Markus Friedl + +OpenBSD 8.0 May 21, 2026 SFTP-SERVER(8) diff --git a/sftp.0 b/sftp.0 new file mode 100644 index 000000000000..ed51b3e583a2 --- /dev/null +++ b/sftp.0 @@ -0,0 +1,477 @@ +SFTP(1) General Commands Manual SFTP(1) + +NAME + sftp M-bM-^@M-^S OpenSSH secure file transfer + +SYNOPSIS + sftp [-46AaCfNpqrv] [-B buffer_size] [-b batchfile] [-c cipher] + [-D sftp_server_command] [-F ssh_config] [-i identity_file] + [-J destination] [-l limit] [-o ssh_option] [-P port] + [-R num_requests] [-S program] [-s subsystem | sftp_server] + [-X sftp_option] destination + +DESCRIPTION + sftp is a file transfer program, similar to ftp(1), which performs all + operations over an encrypted ssh(1) transport. It may also use many + features of ssh, such as public key authentication and compression. + + The destination may be specified either as [user@]host[:path] or as a URI + in the form sftp://[user@]host[:port][/path]. + + If the destination includes a path and it is not a directory, sftp will + retrieve files automatically if a non-interactive authentication method + is used; otherwise it will do so after successful interactive + authentication. + + If no path is specified, or if the path is a directory, sftp will log in + to the specified host and enter interactive command mode, changing to the + remote directory if one was specified. An optional trailing slash can be + used to force the path to be interpreted as a directory. + + Since the destination formats use colon characters to delimit host names + from path names or port numbers, IPv6 addresses must be enclosed in + square brackets to avoid ambiguity. + + The options are as follows: + + -4 Forces sftp to use IPv4 addresses only. + + -6 Forces sftp to use IPv6 addresses only. + + -A Allows forwarding of ssh-agent(1) to the remote system. The + default is not to forward an authentication agent. + + -a Attempt to continue interrupted transfers rather than overwriting + existing partial or complete copies of files. If the partial + contents differ from those being transferred, then the resultant + file is likely to be corrupt. + + -B buffer_size + Specify the size of the buffer that sftp uses when transferring + files. Larger buffers require fewer round trips at the cost of + higher memory consumption. The default is 32768 bytes. + + -b batchfile + Batch mode reads a series of commands from an input batchfile + instead of stdin. Since it lacks user interaction, it should be + used in conjunction with non-interactive authentication to + obviate the need to enter a password at connection time (see + sshd(8) and ssh-keygen(1) for details). + + A batchfile of M-bM-^@M-^X-M-bM-^@M-^Y may be used to indicate standard input. sftp + will abort if any of the following commands fail: get, put, + reget, reput, rename, ln, rm, mkdir, chdir, ls, lchdir, copy, cp, + chmod, chown, chgrp, lpwd, df, symlink, and lmkdir. + + Termination on error can be suppressed on a command by command + basis by prefixing the command with a M-bM-^@M-^X-M-bM-^@M-^Y character (for example, + -rm /tmp/blah*). Echo of the command may be suppressed by + prefixing the command with a M-bM-^@M-^X@M-bM-^@M-^Y character. These two prefixes + may be combined in any order, for example -@ls /bsd. + + -C Enables compression (via ssh's -C flag). + + -c cipher + Selects the cipher to use for encrypting the data transfers. + This option is directly passed to ssh(1). + + -D sftp_server_command + Connect directly to a local sftp server (rather than via ssh(1)). + A command and arguments may be specified, for example + "/path/sftp-server -el debug3". This option may be useful in + debugging the client and server. + + -F ssh_config + Specifies an alternative per-user configuration file for ssh(1). + This option is directly passed to ssh(1). + + -f Requests that files be flushed to disk immediately after + transfer. When uploading files, this feature is only enabled if + the server implements the "fsync@openssh.com" extension. + + -i identity_file + Selects the file from which the identity (private key) for public + key authentication is read. This option is directly passed to + ssh(1). + + -J destination + Connect to the target host by first making an sftp connection to + the jump host described by destination and then establishing a + TCP forwarding to the ultimate destination from there. Multiple + jump hops may be specified separated by comma characters. This + is a shortcut to specify a ProxyJump configuration directive. + This option is directly passed to ssh(1). + + -l limit + Limits the used bandwidth, specified in Kbit/s. + + -N Disables quiet mode, e.g. to override the implicit quiet mode set + by the -b flag. + + -o ssh_option + Can be used to pass options to ssh in the format used in + ssh_config(5). This is useful for specifying options for which + there is no separate sftp command-line flag. For example, to + specify an alternate port use: sftp -oPort=24. For full details + of the options listed below, and their possible values, see + ssh_config(5). + + AddKeysToAgent + AddressFamily + BatchMode + BindAddress + BindInterface + CASignatureAlgorithms + CanonicalDomains + CanonicalizeFallbackLocal + CanonicalizeHostname + CanonicalizeMaxDots + CanonicalizePermittedCNAMEs + CertificateFile + ChannelTimeout + CheckHostIP + Ciphers + ClearAllForwardings + Compression + ConnectTimeout + ConnectionAttempts + ControlMaster + ControlPath + ControlPersist + DynamicForward + EnableEscapeCommandline + EnableSSHKeysign + EscapeChar + ExitOnForwardFailure + FingerprintHash + ForkAfterAuthentication + ForwardAgent + ForwardX11 + ForwardX11Timeout + ForwardX11Trusted + GSSAPIAuthentication + GSSAPIDelegateCredentials + GatewayPorts + GlobalKnownHostsFile + HashKnownHosts + Host + HostKeyAlgorithms + HostKeyAlias + HostbasedAcceptedAlgorithms + HostbasedAuthentication + Hostname + IPQoS + IdentitiesOnly + IdentityAgent + IdentityFile + IgnoreUnknown + Include + KbdInteractiveAuthentication + KbdInteractiveDevices + KexAlgorithms + KnownHostsCommand + LocalCommand + LocalForward + LogLevel + LogVerbose + MACs + NoHostAuthenticationForLocalhost + NumberOfPasswordPrompts + ObscureKeystrokeTiming + PKCS11Provider + PasswordAuthentication + PermitLocalCommand + PermitRemoteOpen + Port + PreferredAuthentications + ProxyCommand + ProxyJump + ProxyUseFdpass + PubkeyAcceptedAlgorithms + PubkeyAuthentication + RekeyLimit + RemoteCommand + RemoteForward + RequestTTY + RequiredRSASize + RevokedHostKeys + SecurityKeyProvider + SendEnv + ServerAliveCountMax + ServerAliveInterval + SessionType + SetEnv + StdinNull + StreamLocalBindMask + StreamLocalBindUnlink + StrictHostKeyChecking + SyslogFacility + TCPKeepAlive + Tag + Tunnel + TunnelDevice + UpdateHostKeys + User + UserKnownHostsFile + VerifyHostKeyDNS + VisualHostKey + XAuthLocation + + -P port + Specifies the port to connect to on the remote host. + + -p Preserves modification times, access times, and modes from the + original files transferred. + + -q Quiet mode: disables the progress meter as well as warning and + diagnostic messages from ssh(1). + + -R num_requests + Specify how many requests may be outstanding at any one time. + Increasing this may slightly improve file transfer speed but will + increase memory usage. The default is 64 outstanding requests. + + -r Recursively copy entire directories when uploading and + downloading. Note that sftp does not follow symbolic links + encountered in the tree traversal. + + -S program + Name of the program to use for the encrypted connection. The + program must understand ssh(1) options. + + -s subsystem | sftp_server + Specifies the SSH2 subsystem or the path for an sftp server on + the remote host. A path is useful when the remote sshd(8) does + not have an sftp subsystem configured. + + -v Raise logging level. This option is also passed to ssh. + + -X sftp_option + Specify an option that controls aspects of SFTP protocol + behaviour. The valid options are: + + nrequests=value + Controls how many concurrent SFTP read or write requests + may be in progress at any point in time during a download + or upload. By default 64 requests may be active + concurrently. + + buffer=value + Controls the maximum buffer size for a single SFTP + read/write operation used during download or upload. By + default a 32KB buffer is used. + +INTERACTIVE COMMANDS + Once in interactive mode, sftp understands a set of commands similar to + those of ftp(1). Commands are case insensitive. Pathnames that contain + spaces must be enclosed in quotes. Any special characters contained + within pathnames that are recognized by glob(3) must be escaped with + backslashes (M-bM-^@M-^X\M-bM-^@M-^Y). + + bye Quit sftp. + + cd [path] + Change remote directory to path. If path is not specified, then + change directory to the one the session started in. + + chgrp [-h] grp path + Change group of file path to grp. path may contain glob(7) + characters and may match multiple files. grp must be a numeric + GID. + + If the -h flag is specified, then symlinks will not be followed. + Note that this is only supported by servers that implement the + "lsetstat@openssh.com" extension. + + chmod [-h] mode path + Change permissions of file path to mode. path may contain + glob(7) characters and may match multiple files. + + If the -h flag is specified, then symlinks will not be followed. + Note that this is only supported by servers that implement the + "lsetstat@openssh.com" extension. + + chown [-h] own path + Change owner of file path to own. path may contain glob(7) + characters and may match multiple files. own must be a numeric + UID. + + If the -h flag is specified, then symlinks will not be followed. + Note that this is only supported by servers that implement the + "lsetstat@openssh.com" extension. + + copy oldpath newpath + Copy remote file from oldpath to newpath. + + Note that this is only supported by servers that implement the + "copy-data" extension. + + cp oldpath newpath + Alias to copy command. + + df [-hi] [path] + Display usage information for the filesystem holding the current + directory (or path if specified). If the -h flag is specified, + the capacity information will be displayed using "human-readable" + suffixes. The -i flag requests display of inode information in + addition to capacity information. This command is only supported + on servers that implement the M-bM-^@M-^\statvfs@openssh.comM-bM-^@M-^] extension. + + exit Quit sftp. + + get [-afpR] remote-path [local-path] + Retrieve the remote-path and store it on the local machine. If + the local path name is not specified, it is given the same name + it has on the remote machine. remote-path may contain glob(7) + characters and may match multiple files. If it does and + local-path is specified, then local-path must specify a + directory. + + If the -a flag is specified, then attempt to resume partial + transfers of existing files. Note that resumption assumes that + any partial copy of the local file matches the remote copy. If + the remote file contents differ from the partial local copy then + the resultant file is likely to be corrupt. + + If the -f flag is specified, then fsync(2) will be called after + the file transfer has completed to flush the file to disk. + + If the -p flag is specified, then full file permissions and + access times are copied too. + + If the -R flag is specified then directories will be copied + recursively. Note that sftp does not follow symbolic links when + performing recursive transfers. + + help Display help text. + + lcd [path] + Change local directory to path. If path is not specified, then + change directory to the local user's home directory. + + lls [ls-options [path]] + Display local directory listing of either path or current + directory if path is not specified. ls-options may contain any + flags supported by the local system's ls(1) command. path may + contain glob(7) characters and may match multiple files. + + lmkdir path + Create local directory specified by path. + + ln [-s] oldpath newpath + Create a link from oldpath to newpath. If the -s flag is + specified the created link is a symbolic link, otherwise it is a + hard link. + + lpwd Print local working directory. + + ls [-1afhlnrSt] [path] + Display a remote directory listing of either path or the current + directory if path is not specified. path may contain glob(7) + characters and may match multiple files. + + The following flags are recognized and alter the behaviour of ls + accordingly: + + -1 Produce single columnar output. + + -a List files beginning with a dot (M-bM-^@M-^X.M-bM-^@M-^Y). + + -f Do not sort the listing. The default sort order is + lexicographical. + + -h When used with a long format option, use unit suffixes: + Byte, Kilobyte, Megabyte, Gigabyte, Terabyte, Petabyte, + and Exabyte in order to reduce the number of digits to + four or fewer using powers of 2 for sizes (K=1024, + M=1048576, etc.). + + -l Display additional details including permissions and + ownership information. + + -n Produce a long listing with user and group information + presented numerically. + + -r Reverse the sort order of the listing. + + -S Sort the listing by file size. + + -t Sort the listing by last modification time. + + lumask umask + Set local umask to umask. + + mkdir path + Create remote directory specified by path. + + progress + Toggle display of progress meter. + + put [-afpR] local-path [remote-path] + Upload local-path and store it on the remote machine. If the + remote path name is not specified, it is given the same name it + has on the local machine. local-path may contain glob(7) + characters and may match multiple files. If it does and + remote-path is specified, then remote-path must specify a + directory. + + If the -a flag is specified, then attempt to resume partial + transfers of existing files. Note that resumption assumes that + any partial copy of the remote file matches the local copy. If + the local file contents differ from the remote local copy then + the resultant file is likely to be corrupt. + + If the -f flag is specified, then a request will be sent to the + server to call fsync(2) after the file has been transferred. + Note that this is only supported by servers that implement the + "fsync@openssh.com" extension. + + If the -p flag is specified, then full file permissions and + access times are copied too. + + If the -R flag is specified then directories will be copied + recursively. Note that sftp does not follow symbolic links when + performing recursive transfers. + + pwd Display remote working directory. + + quit Quit sftp. + + reget [-fpR] remote-path [local-path] + Resume download of remote-path. Equivalent to get with the -a + flag set. + + reput [-fpR] local-path [remote-path] + Resume upload of local-path. Equivalent to put with the -a flag + set. + + rename oldpath newpath + Rename remote file from oldpath to newpath. + + rm path + Delete remote file specified by path. + + rmdir path + Remove remote directory specified by path. + + symlink oldpath newpath + Create a symbolic link from oldpath to newpath. + + version + Display the sftp protocol version. + + !command + Execute command in local shell. + + ! Escape to local shell. + + ? Synonym for help. + +SEE ALSO + ftp(1), ls(1), scp(1), ssh(1), ssh-add(1), ssh-keygen(1), ssh_config(5), + glob(7), sftp-server(8), sshd(8) + + T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh- + filexfer-00.txt, January 2001, work in progress material. + +OpenBSD 8.0 December 6, 2024 SFTP(1) diff --git a/sk-usbhid.c b/sk-usbhid.c index ce59c4e9317d..647f88f619b4 100644 --- a/sk-usbhid.c +++ b/sk-usbhid.c @@ -31,15 +31,6 @@ #include #endif -/* - * Almost every use of OpenSSL in this file is for ECDSA-NISTP256. - * This is strictly a larger hammer than necessary, but it reduces changes - * with upstream. - */ -#ifndef OPENSSL_HAS_ECC -# undef WITH_OPENSSL -#endif - #ifdef WITH_OPENSSL #include #include diff --git a/ssh-add.0 b/ssh-add.0 new file mode 100644 index 000000000000..bc260e1f5506 --- /dev/null +++ b/ssh-add.0 @@ -0,0 +1,221 @@ +SSH-ADD(1) General Commands Manual SSH-ADD(1) + +NAME + ssh-add M-bM-^@M-^S adds private key identities to the OpenSSH authentication agent + +SYNOPSIS + ssh-add [-CcDdKkLlNqvXx] [-E fingerprint_hash] [-H hostkey_file] + [-h destination_constraint] [-S provider] [-t life] [file ...] + ssh-add -s pkcs11 [-Cv] [certificate ...] + ssh-add -e pkcs11 + ssh-add -T pubkey ... + ssh-add -Q + +DESCRIPTION + ssh-add adds private key identities to the authentication agent, + ssh-agent(1). When run without arguments, it adds the files + ~/.ssh/id_rsa, ~/.ssh/id_ecdsa, ~/.ssh/id_ecdsa_sk, ~/.ssh/id_ed25519, + ~/.ssh/id_ed25519_sk and ~/.ssh/id_mldsa44_ed25519. After loading a + private key, ssh-add will try to load corresponding certificate + information from the filename obtained by appending -cert.pub to the name + of the private key file. Alternative file names can be given on the + command line. + + If any file requires a passphrase, ssh-add asks for the passphrase from + the user. The passphrase is read from the user's tty. ssh-add retries + the last passphrase if multiple identity files are given. + + The authentication agent must be running and the SSH_AUTH_SOCK + environment variable must contain the name of its socket for ssh-add to + work. + + The options are as follows: + + -C When loading keys into or deleting keys from the agent, process + certificates only and skip plain keys. + + -c Indicates that added identities should be subject to confirmation + before being used for authentication. Confirmation is performed + by ssh-askpass(1). Successful confirmation is signaled by a zero + exit status from ssh-askpass(1), rather than text entered into + the requester. + + -D Deletes all identities from the agent. + + -d Instead of adding identities, removes identities from the agent. + If ssh-add has been run without arguments, the keys for the + default identities and their corresponding certificates will be + removed. Otherwise, the argument list will be interpreted as a + list of paths to public key files to specify keys and + certificates to be removed from the agent. If no public key is + found at a given path, ssh-add will append .pub and retry. If + the argument list consists of M-bM-^@M-^\-M-bM-^@M-^] then ssh-add will read public + keys to be removed from standard input. + + -E fingerprint_hash + Specifies the hash algorithm used when displaying key + fingerprints. Valid options are: M-bM-^@M-^\md5M-bM-^@M-^] and M-bM-^@M-^\sha256M-bM-^@M-^]. The + default is M-bM-^@M-^\sha256M-bM-^@M-^]. + + -e pkcs11 + Remove keys provided by the PKCS#11 shared library pkcs11. + + -H hostkey_file + Specifies a known hosts file to look up hostkeys when using + destination-constrained keys via the -h flag. This option may be + specified multiple times to allow multiple files to be searched. + If no files are specified, ssh-add will use the default + ssh_config(5) known hosts files: ~/.ssh/known_hosts, + ~/.ssh/known_hosts2, /etc/ssh/ssh_known_hosts, and + /etc/ssh/ssh_known_hosts2. + + -h destination_constraint + When adding keys, constrain them to be usable only through + specific hosts or to specific destinations. + + Destination constraints of the form M-bM-^@M-^X[user@]dest-hostnameM-bM-^@M-^Y permit + use of the key only from the origin host (the one running + ssh-agent(1)) to the listed destination host, with optional user + name. + + Constraints of the form M-bM-^@M-^Xsrc-hostname>[user@]dst-hostnameM-bM-^@M-^Y allow + a key available on a forwarded ssh-agent(1) to be used through a + particular host (as specified by M-bM-^@M-^Xsrc-hostnameM-bM-^@M-^Y) to authenticate + to a further host, specified by M-bM-^@M-^Xdst-hostnameM-bM-^@M-^Y. + + Multiple destination constraints may be added when loading keys. + When attempting authentication with a key that has destination + constraints, the whole connection path, including ssh-agent(1) + forwarding, is tested against those constraints and each hop must + be permitted for the attempt to succeed. For example, if key is + forwarded to a remote host, M-bM-^@M-^Xhost-bM-bM-^@M-^Y, and is attempting + authentication to another host, M-bM-^@M-^Xhost-cM-bM-^@M-^Y, then the operation will + be successful only if M-bM-^@M-^Xhost-bM-bM-^@M-^Y was permitted from the origin host + and the subsequent M-bM-^@M-^Xhost-b>host-cM-bM-^@M-^Y hop is also permitted by + destination constraints. + + Hosts are identified by their host keys, and are looked up from + known hosts files by ssh-add. Wildcards patterns may be used for + hostnames and certificate host keys are supported. By default, + keys added by ssh-add are not destination constrained. + + Destination constraints were added in OpenSSH release 8.9. + Support in both the remote SSH client and server is required when + using destination-constrained keys over a forwarded ssh-agent(1) + channel. + + It is also important to note that destination constraints can + only be enforced by ssh-agent(1) when a key is used, or when it + is forwarded by a cooperating ssh(1). Specifically, it does not + prevent an attacker with access to a remote SSH_AUTH_SOCK from + forwarding it again and using it on a different host (but only to + a permitted destination). + + -K Load resident keys from a FIDO authenticator. + + -k When loading keys into or deleting keys from the agent, process + plain private keys only and skip certificates. + + -L Lists public key parameters of all identities currently + represented by the agent. + + -l Lists fingerprints of all identities currently represented by the + agent. + + -N When adding certificates, by default ssh-add will request that + the agent automatically delete the certificate shortly after the + certificate's expiry date. This flag suppresses this behaviour + and does not specify a lifetime for certificates added to an + agent. + + -Q Query the agent for the list of protocol extensions it supports. + Note: not all agents support this query. + + -q Be quiet after a successful operation. + + -S provider + Specifies a path to a library that will be used when adding FIDO + authenticator-hosted keys, overriding the default of using the + internal USB HID support. + + -s pkcs11 + Add keys provided by the PKCS#11 shared library pkcs11. + Certificate files may optionally be listed as command-line + arguments. If these are present, then they will be loaded into + the agent using any corresponding private keys loaded from the + PKCS#11 token. + + -T pubkey ... + Tests whether the private keys that correspond to the specified + pubkey files are usable by performing sign and verify operations + on each. + + -t life + Set a maximum lifetime when adding identities to an agent. The + lifetime may be specified in seconds or in a time format + specified in sshd_config(5). + + -v Verbose mode. Causes ssh-add to print debugging messages about + its progress. This is helpful in debugging problems. Multiple + -v options increase the verbosity. The maximum is 3. + + -X Unlock the agent. + + -x Lock the agent with a password. + +ENVIRONMENT + DISPLAY, SSH_ASKPASS and SSH_ASKPASS_REQUIRE + If ssh-add needs a passphrase, it will read the passphrase from + the current terminal if it was run from a terminal. If ssh-add + does not have a terminal associated with it but DISPLAY and + SSH_ASKPASS are set, it will execute the program specified by + SSH_ASKPASS (by default M-bM-^@M-^\ssh-askpassM-bM-^@M-^]) and open an X11 window to + read the passphrase. This is particularly useful when calling + ssh-add from a .xsession or related script. + + SSH_ASKPASS_REQUIRE allows further control over the use of an + askpass program. If this variable is set to M-bM-^@M-^\neverM-bM-^@M-^] then ssh-add + will never attempt to use one. If it is set to M-bM-^@M-^\preferM-bM-^@M-^], then + ssh-add will prefer to use the askpass program instead of the TTY + when requesting passwords. Finally, if the variable is set to + M-bM-^@M-^\forceM-bM-^@M-^], then the askpass program will be used for all passphrase + input regardless of whether DISPLAY is set. + + SSH_AUTH_SOCK + Identifies the path of a Unix-domain socket used to communicate + with the agent. + + SSH_SK_PROVIDER + Specifies a path to a library that will be used when loading any + FIDO authenticator-hosted keys, overriding the default of using + the built-in USB HID support. + +FILES + ~/.ssh/id_ecdsa + ~/.ssh/id_ecdsa_sk + ~/.ssh/id_ed25519 + ~/.ssh/id_ed25519_sk + ~/.ssh/id_mldsa44_ed25519 + ~/.ssh/id_rsa + Contains the ECDSA, authenticator-hosted ECDSA, Ed25519, + authenticator-hosted Ed25519, MLDSA44-ED25519 or RSA + authentication identity of the user. + + Identity files should not be readable by anyone but the user. Note that + ssh-add ignores identity files if they are accessible by others. + +EXIT STATUS + Exit status is 0 on success, 1 if the specified command fails, and 2 if + ssh-add is unable to contact the authentication agent. + +SEE ALSO + ssh(1), ssh-agent(1), ssh-askpass(1), ssh-keygen(1), sshd(8) + +AUTHORS + OpenSSH is a derivative of the original and free ssh 1.2.12 release by + Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo + de Raadt and Dug Song removed many bugs, re-added newer features and + created OpenSSH. Markus Friedl contributed the support for SSH protocol + versions 1.5 and 2.0. + +OpenBSD 8.0 July 11, 2026 SSH-ADD(1) diff --git a/ssh-add.c b/ssh-add.c index 518281ac470f..62f849cda84f 100644 --- a/ssh-add.c +++ b/ssh-add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.187 2026/06/29 02:13:05 djm Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.188 2026/07/11 11:15:03 naddy Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -80,13 +80,12 @@ extern char *__progname; static char *default_files[] = { #ifdef WITH_OPENSSL _PATH_SSH_CLIENT_ID_RSA, -#ifdef OPENSSL_HAS_ECC _PATH_SSH_CLIENT_ID_ECDSA, _PATH_SSH_CLIENT_ID_ECDSA_SK, -#endif #endif /* WITH_OPENSSL */ _PATH_SSH_CLIENT_ID_ED25519, _PATH_SSH_CLIENT_ID_ED25519_SK, + _PATH_SSH_CLIENT_ID_MLDSA44_ED25519, NULL }; diff --git a/ssh-agent.0 b/ssh-agent.0 new file mode 100644 index 000000000000..c4458e2a013e --- /dev/null +++ b/ssh-agent.0 @@ -0,0 +1,180 @@ +SSH-AGENT(1) General Commands Manual SSH-AGENT(1) + +NAME + ssh-agent M-bM-^@M-^S OpenSSH authentication agent + +SYNOPSIS + ssh-agent [-c | -s] [-DdTU] [-a bind_address] [-E fingerprint_hash] + [-O option] [-P allowed_providers] [-t life] + ssh-agent [-TU] [-a bind_address] [-E fingerprint_hash] [-O option] + [-P allowed_providers] [-t life] command [arg ...] + ssh-agent [-c | -s] -k + ssh-agent -u + ssh-agent -V + +DESCRIPTION + ssh-agent is a program to hold private keys used for public key + authentication. Through use of environment variables the agent can be + located and automatically used for authentication when logging in to + other machines using ssh(1). + + The options are as follows: + + -a bind_address + Bind the agent to the Unix-domain socket bind_address. The + default is to create a socket at a random path matching + $HOME/.ssh/agent/s.*. + + -c Generate C-shell commands on standard output. This is the + default if SHELL looks like it's a csh style of shell. + + -D Foreground mode. When this option is specified, ssh-agent will + not fork. + + -d Debug mode. When this option is specified, ssh-agent will not + fork and will write debug information to standard error. + + -E fingerprint_hash + Specifies the hash algorithm used when displaying key + fingerprints. Valid options are: M-bM-^@M-^\md5M-bM-^@M-^] and M-bM-^@M-^\sha256M-bM-^@M-^]. The + default is M-bM-^@M-^\sha256M-bM-^@M-^]. + + -k Kill the current agent (given by the SSH_AGENT_PID environment + variable). + + -O option + Specify an option when starting ssh-agent. The supported options + are: allow-remote-pkcs11, no-restrict-websafe and websafe-allow. + + The allow-remote-pkcs11 option allows clients of a forwarded + ssh-agent to load PKCS#11 or FIDO provider libraries. By default + only local clients may perform this operation. Note that + signalling that an ssh-agent client is remote is performed by + ssh(1), and use of other tools to forward access to the agent + socket may circumvent this restriction. + + The no-restrict-websafe option instructs ssh-agent to permit + signatures using FIDO keys that might be web authentication + requests. By default, ssh-agent refuses signature requests for + FIDO keys where the key application string does not start with + M-bM-^@M-^\ssh:M-bM-^@M-^] and when the data to be signed does not appear to be an + ssh(1) user authentication request or an ssh-keygen(1) signature. + The default behaviour prevents forwarded access to a FIDO key + from also implicitly forwarding the ability to authenticate to + websites. + + Alternately the websafe-allow option allows specifying a pattern- + list of key application strings to replace the default + application allow-list, for example: + M-bM-^@M-^\websafe-allow=ssh:*,example.org,*.example.comM-bM-^@M-^] + + See PATTERNS in ssh_config(5) for a description of pattern-list + syntax. + + -P allowed_providers + Specify a pattern-list of acceptable paths for PKCS#11 provider + and FIDO authenticator middleware shared libraries that may be + used with the -S or -s options to ssh-add(1). Libraries that do + not match the pattern list will be refused. The default list is + M-bM-^@M-^\/usr/lib*/*,/usr/local/lib*/*M-bM-^@M-^]. + + See PATTERNS in ssh_config(5) for a description of pattern-list + syntax. + + -s Generate Bourne shell commands on standard output. This is the + default if SHELL does not look like it's a csh style of shell. + + -T Bind the agent socket in a randomised subdirectory of the form + $TMPDIR/ssh-XXXXXXXXXX/agent., instead of the default + behaviour of using a randomised name matching + $HOME/.ssh/agent/s.*. + + -t life + Set a default value for the maximum lifetime of identities added + to the agent. The lifetime may be specified in seconds or in a + time format specified in sshd_config(5). A lifetime specified + for an identity with ssh-add(1) overrides this value. Without + this option the default maximum lifetime is forever. + + -U Instructs ssh-agent not to clean up stale agent sockets under + $HOME/.ssh/agent/. + + -u Instructs ssh-agent to only clean up stale agent sockets under + $HOME/.ssh/agent/ and then exit immediately. If this option is + given twice, ssh-agent will delete stale agent sockets regardless + of the host name that created them. + + command [arg ...] + If a command (and optional arguments) is given, this is executed + as a subprocess of the agent. The agent exits automatically when + the command given on the command line terminates. + + -V Display the version number and exit. + + There are three main ways to get an agent set up. The first is at the + start of an X session, where all other windows or programs are started as + children of the ssh-agent program. The agent starts a command under + which its environment variables are exported, for example ssh-agent xterm + &. When the command terminates, so does the agent. + + The second method is used for a login session. When ssh-agent is + started, it prints the shell commands required to set its environment + variables, which in turn can be evaluated in the calling shell, for + example eval `ssh-agent -s`. + + In both of these cases, ssh(1) looks at these environment variables and + uses them to establish a connection to the agent. + + The third way to run ssh-agent is via socket activation from a + supervising process, such as systemd. In this mode, the supervising + process creates the listening socket and is responsible for starting + ssh-agent as needed, and also for communicating the location of the + socket listener to other programs in the user's session. Socket + activation is used when ssh-agent is started with either of the -d or -D + flags, no socket listening address specified by the -a flag, and both the + LISTEN_FDS and LISTEN_PID environment variables correctly supplied by the + supervising process. + + The agent initially does not have any private keys. Keys are added using + ssh-add(1) or by ssh(1) when AddKeysToAgent is set in ssh_config(5). + Multiple identities may be stored in ssh-agent concurrently and ssh(1) + will automatically use them if present. ssh-add(1) is also used to + remove keys from ssh-agent and to query the keys that are held in one. + + Connections to ssh-agent may be forwarded from further remote hosts using + the -A option to ssh(1) (but see the caveats documented therein), + avoiding the need for authentication data to be stored on other machines. + Authentication passphrases and private keys never go over the network: + the connection to the agent is forwarded over SSH remote connections and + the result is returned to the requester, allowing the user access to + their identities anywhere in the network in a secure fashion. + + ssh-agent will delete all keys it has loaded upon receiving SIGUSR1. + +ENVIRONMENT + SSH_AGENT_PID When ssh-agent starts, it stores the name of the agent's + process ID (PID) in this variable. + + SSH_AUTH_SOCK When ssh-agent starts, it creates a Unix-domain socket and + stores its pathname in this variable. It is accessible + only to the current user, but is easily abused by root or + another instance of the same user. + +FILES + $HOME/.ssh/agent/s.* + Unix-domain sockets used to contain the connection to the + authentication agent. These sockets should only be readable by + the owner. The sockets should get automatically removed when the + agent exits. + +SEE ALSO + ssh(1), ssh-add(1), ssh-keygen(1), ssh_config(5), sshd(8) + +AUTHORS + OpenSSH is a derivative of the original and free ssh 1.2.12 release by + Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo + de Raadt and Dug Song removed many bugs, re-added newer features and + created OpenSSH. Markus Friedl contributed the support for SSH protocol + versions 1.5 and 2.0. + +OpenBSD 8.0 May 27, 2026 SSH-AGENT(1) diff --git a/ssh-agent.c b/ssh-agent.c index 91fdb91ad1c9..299b6177b5e3 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.330 2026/07/05 02:46:44 dtucker Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.331 2026/08/07 05:18:05 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1802,12 +1802,22 @@ process_extension(SocketEntry *e) return; } - if (strcmp(name, "query") == 0) - replied = success = process_ext_query(e); - else if (strcmp(name, "session-bind@openssh.com") == 0) + /* + * This function can be called while the agent is locked to allow + * session binds to be processed for new channels. + * Other operations should be refused when locked. + */ + + if (strcmp(name, "session-bind@openssh.com") == 0) { success = process_ext_session_bind(e); - else { + } else if (locked) { + debug_f("attempt to use extension \"%s\" while locked", name); + goto generic_fail; + } else if (strcmp(name, "query") == 0) { + replied = success = process_ext_query(e); + } else { debug_f("unsupported extension \"%s\"", name); + generic_fail: free(name); send_status(e, 0); return; @@ -1865,16 +1875,19 @@ process_message(u_int socknum) /* check whether agent is locked */ if (locked && type != SSH_AGENTC_UNLOCK) { - sshbuf_reset(e->request); switch (type) { case SSH2_AGENTC_REQUEST_IDENTITIES: /* send empty lists */ no_identities(e); break; + case SSH_AGENTC_EXTENSION: + process_extension(e); + break; default: /* send a fail message for all other request types */ send_status(e, 0); } + sshbuf_reset(e->request); return 1; } diff --git a/ssh-ecdsa-sk.c b/ssh-ecdsa-sk.c index eb5c8bc1eb0d..ad8afd0794fc 100644 --- a/ssh-ecdsa-sk.c +++ b/ssh-ecdsa-sk.c @@ -32,35 +32,21 @@ #include #ifdef WITH_OPENSSL +#include "openbsd-compat/openssl-compat.h" #include #include #include #include -#endif #include #include /* needed for DEBUG_SK only */ -#include "openbsd-compat/openssl-compat.h" - #include "sshbuf.h" #include "ssherr.h" #include "digest.h" #define SSHKEY_INTERNAL #include "sshkey.h" -#ifndef OPENSSL_HAS_ECC -/* ARGSUSED */ -int -ssh_ecdsa_sk_verify(const struct sshkey *key, - const u_char *signature, size_t signaturelen, - const u_char *data, size_t datalen, u_int compat, - struct sshkey_sig_details **detailsp) -{ - return SSH_ERR_FEATURE_UNSUPPORTED; -} -#else /* OPENSSL_HAS_ECC */ - /* Reuse some ECDSA internals */ extern struct sshkey_impl_funcs sshkey_ecdsa_funcs; @@ -502,5 +488,4 @@ const struct sshkey_impl sshkey_ecdsa_sk_webauthn_cert_impl = { /* .keybits = */ 256, /* .funcs = */ &sshkey_ecdsa_sk_funcs, }; - -#endif /* OPENSSL_HAS_ECC */ +#endif /* WITH_OPENSSL */ diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c index 526ae74546f5..54a626e3f268 100644 --- a/ssh-ecdsa.c +++ b/ssh-ecdsa.c @@ -26,7 +26,7 @@ #include "includes.h" -#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) +#if defined(WITH_OPENSSL) #include "openbsd-compat/openssl-compat.h" #include @@ -49,9 +49,7 @@ sshkey_ecdsa_fixup_group(EVP_PKEY *k) int nids[] = { NID_X9_62_prime256v1, NID_secp384r1, -#ifdef OPENSSL_HAS_NISTP521 NID_secp521r1, -#endif -1 }; int nid = -1; @@ -106,10 +104,8 @@ ssh_ecdsa_size(const struct sshkey *key) return 256; case NID_secp384r1: return 384; -#ifdef OPENSSL_HAS_NISTP521 case NID_secp521r1: return 521; -#endif default: return 0; } @@ -556,7 +552,6 @@ const struct sshkey_impl sshkey_ecdsa_nistp384_cert_impl = { /* .funcs = */ &sshkey_ecdsa_funcs, }; -#ifdef OPENSSL_HAS_NISTP521 const struct sshkey_impl sshkey_ecdsa_nistp521_impl = { /* .name = */ "ecdsa-sha2-nistp521", /* .shortname = */ "ECDSA", @@ -580,6 +575,5 @@ const struct sshkey_impl sshkey_ecdsa_nistp521_cert_impl = { /* .keybits = */ 0, /* .funcs = */ &sshkey_ecdsa_funcs, }; -#endif -#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */ +#endif /* WITH_OPENSSL */ diff --git a/ssh-ed25519.c b/ssh-ed25519.c index 2369c3af069b..8228f2830fdc 100644 --- a/ssh-ed25519.c +++ b/ssh-ed25519.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-ed25519.c,v 1.22 2026/02/14 00:18:34 jsg Exp $ */ +/* $OpenBSD: ssh-ed25519.c,v 1.23 2026/07/30 03:39:39 djm Exp $ */ /* * Copyright (c) 2013 Markus Friedl * @@ -83,7 +83,8 @@ ssh_ed25519_generate(struct sshkey *k, int bits) if ((k->ed25519_pk = malloc(ED25519_PK_SZ)) == NULL || (k->ed25519_sk = malloc(ED25519_SK_SZ)) == NULL) return SSH_ERR_ALLOC_FAIL; - crypto_sign_ed25519_keypair(k->ed25519_pk, k->ed25519_sk); + if (crypto_sign_ed25519_keypair(k->ed25519_pk, k->ed25519_sk) != 0) + return SSH_ERR_CRYPTO_ERROR; return 0; } diff --git a/ssh-keygen.0 b/ssh-keygen.0 new file mode 100644 index 000000000000..f4bf2878c740 --- /dev/null +++ b/ssh-keygen.0 @@ -0,0 +1,936 @@ +SSH-KEYGEN(1) General Commands Manual SSH-KEYGEN(1) + +NAME + ssh-keygen M-bM-^@M-^S OpenSSH authentication key utility + +SYNOPSIS + ssh-keygen [-q] [-a rounds] [-b bits] [-C comment] [-f output_keyfile] + [-m format] [-N new_passphrase] [-O option] + [-t ecdsa | + ecdsa-sk | ed25519 | ed25519-sk | mldsa44-ed25519 | rsa] + [-w provider] [-Z cipher] + ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase] + [-P old_passphrase] [-Z cipher] + ssh-keygen -i [-f input_keyfile] [-m key_format] + ssh-keygen -e [-f input_keyfile] [-m key_format] + ssh-keygen -y [-f input_keyfile] + ssh-keygen -c [-a rounds] [-C comment] [-f keyfile] [-P passphrase] + ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile] + ssh-keygen -B [-f input_keyfile] + ssh-keygen -D pkcs11 + ssh-keygen -F hostname [-lv] [-f known_hosts_file] + ssh-keygen -H [-f known_hosts_file] + ssh-keygen -K [-a rounds] [-w provider] + ssh-keygen -R hostname [-f known_hosts_file] + ssh-keygen -r hostname [-g] [-f input_keyfile] + ssh-keygen -M generate [-O option] output_file + ssh-keygen -M screen [-f input_file] [-O option] output_file + ssh-keygen -I certificate_identity -s ca_key [-hU] [-D pkcs11_provider] + [-n principals] [-O option] [-V validity_interval] + [-z serial_number] file ... + ssh-keygen -L [-f input_keyfile] + ssh-keygen -A [-a rounds] [-f prefix_path] + ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number] + file ... + ssh-keygen -Q [-l] -f krl_file file ... + ssh-keygen -Y find-principals [-O option] -s signature_file + -f allowed_signers_file + ssh-keygen -Y match-principals -I signer_identity -f allowed_signers_file + ssh-keygen -Y check-novalidate [-O option] -n namespace -s signature_file + ssh-keygen -Y sign [-O option] -f key_file -n namespace file ... + ssh-keygen -Y verify [-O option] -f allowed_signers_file + -I signer_identity -n namespace -s signature_file + [-r revocation_file] + +DESCRIPTION + ssh-keygen generates, manages and converts authentication keys for + ssh(1). ssh-keygen can create keys for use by SSH protocol version 2. + + The type of key to be generated is specified with the -t option. If + invoked without any arguments, ssh-keygen will generate an Ed25519 key. + + ssh-keygen is also used to generate groups for use in Diffie-Hellman + group exchange (DH-GEX). See the MODULI GENERATION section for details. + + Finally, ssh-keygen can be used to generate and update Key Revocation + Lists, and to test whether given keys have been revoked by one. See the + KEY REVOCATION LISTS section for details. + + Normally each user wishing to use SSH with public key authentication runs + this once to create the authentication key in ~/.ssh/id_ecdsa, + ~/.ssh/id_ecdsa_sk, ~/.ssh/id_ed25519, ~/.ssh/id_ed25519_sk, + ~/.ssh/id_mldsa44_ed25519 or ~/.ssh/id_rsa. Additionally, the system + administrator may use this to generate host keys, as seen in /etc/rc. + + Normally this program generates the key and asks for a file in which to + store the private key. The public key is stored in a file with the same + name but M-bM-^@M-^\.pubM-bM-^@M-^] appended. The program also asks for a passphrase. The + passphrase may be empty to indicate no passphrase (host keys must have an + empty passphrase), or it may be a string of arbitrary length. A + passphrase is similar to a password, except it can be a phrase with a + series of words, punctuation, numbers, whitespace, or any string of + characters you want. Good passphrases are 10-30 characters long, are not + simple sentences or otherwise easily guessable (English prose has only + 1-2 bits of entropy per character, and provides very bad passphrases), + and contain a mix of upper and lowercase letters, numbers, and non- + alphanumeric characters. The passphrase can be changed later by using + the -p option. + + There is no way to recover a lost passphrase. If the passphrase is lost + or forgotten, a new key must be generated and the corresponding public + key copied to other machines. + + ssh-keygen will by default write keys in an OpenSSH-specific format. + This format is preferred as it offers better protection for keys at rest + as well as allowing storage of key comments within the private key file + itself. The key comment may be useful to help identify the key. The + comment is initialized to M-bM-^@M-^\user@hostM-bM-^@M-^] when the key is created, but can be + changed using the -c option. + + It is still possible for ssh-keygen to write the previously-used PEM + format private keys using the -m flag. This may be used when generating + new keys, and existing new-format keys may be converted using this option + in conjunction with the -p (change passphrase) flag. + + After a key is generated, ssh-keygen will ask where the keys should be + placed to be activated. + + The options are as follows: + + -A Generate host keys of all default key types (rsa, ecdsa, + mldsa44-ed25519 and ed25519) if they do not already exist. The + host keys are generated with the default key file path, an empty + passphrase, default bits for the key type, and default comment. + If -f has also been specified, its argument is used as a prefix + to the default path for the resulting host key files. This is + used by /etc/rc to generate new host keys. + + -a rounds + When saving a private key, this option specifies the number of + KDF (key derivation function, currently bcrypt_pbkdf(3)) rounds + used. Higher numbers result in slower passphrase verification + and increased resistance to brute-force password cracking (should + the keys be stolen). The default is 16 rounds. + + -B Show the bubblebabble digest of specified private or public key + file. + + -b bits + Specifies the number of bits in the key to create. For RSA keys, + the minimum size is 1024 bits and the default is 3072 bits. + Generally, 3072 bits is considered sufficient. For ECDSA keys, + the -b flag determines the key length by selecting from one of + three elliptic curve sizes: 256, 384 or 521 bits. Attempting to + use bit lengths other than these three values for ECDSA keys will + fail. ECDSA-SK, Ed25519 and Ed25519-SK keys have a fixed length + and the -b flag will be ignored. + + -C comment + Provides a new comment. + + -c Requests changing the comment in the private and public key + files. The program will prompt for the file containing the + private keys, for the passphrase if the key has one, and for the + new comment. + + -D pkcs11 + Download the public keys provided by the PKCS#11 shared library + pkcs11. When used in combination with -s, this option indicates + that a CA key resides in a PKCS#11 token (see the CERTIFICATES + section for details). + + -E fingerprint_hash + Specifies the hash algorithm used when displaying key + fingerprints. Valid options are: M-bM-^@M-^\md5M-bM-^@M-^] and M-bM-^@M-^\sha256M-bM-^@M-^]. The + default is M-bM-^@M-^\sha256M-bM-^@M-^]. + + -e This option will read a private or public OpenSSH key file and + print to stdout a public key in one of the formats specified by + the -m option. The default export format is M-bM-^@M-^\RFC4716M-bM-^@M-^]. This + option allows exporting OpenSSH keys for use by other programs, + including several commercial SSH implementations. + + -F hostname | [hostname]:port + Search for the specified hostname (with optional port number) in + a known_hosts file, listing any occurrences found. This option + is useful to find hashed host names or addresses and may also be + used in conjunction with the -H option to print found keys in a + hashed format. + + -f filename + Specifies the filename of the key file. + + -g Use generic DNS format when printing fingerprint resource records + using the -r command. + + -H Hash a known_hosts file. This replaces all hostnames and + addresses with hashed representations within the specified file; + the original content is moved to a file with a .old suffix. + These hashes may be used normally by ssh and sshd, but they do + not reveal identifying information should the file's contents be + disclosed. This option will not modify existing hashed hostnames + and is therefore safe to use on files that mix hashed and non- + hashed names. + + -h When signing a key, create a host certificate instead of a user + certificate. See the CERTIFICATES section for details. + + -I certificate_identity + Specify the key identity when signing a public key. See the + CERTIFICATES section for details. + + -i This option will read an unencrypted private (or public) key file + in the format specified by the -m option and print an OpenSSH + compatible private (or public) key to stdout. This option allows + importing keys from other software, including several commercial + SSH implementations. The default import format is M-bM-^@M-^\RFC4716M-bM-^@M-^]. + + -K Download resident keys from a FIDO authenticator. Public and + private key files will be written to the current directory for + each downloaded key. If multiple FIDO authenticators are + attached, keys will be downloaded from the first touched + authenticator. See the FIDO AUTHENTICATOR section for more + information. + + -k Generate a KRL file. In this mode, ssh-keygen will generate a + KRL file at the location specified via the -f flag that revokes + every key or certificate presented on the command line. + Keys/certificates to be revoked may be specified by public key + file or using the format described in the KEY REVOCATION LISTS + section. + + -L Prints the contents of one or more certificates. + + -l Show fingerprint of specified public key file. ssh-keygen will + try to find the matching public key file and prints its + fingerprint. If combined with -v, a visual ASCII art + representation of the key is supplied with the fingerprint. + + -M generate + Generate candidate Diffie-Hellman Group Exchange (DH-GEX) + parameters for eventual use by the + M-bM-^@M-^Xdiffie-hellman-group-exchange-*M-bM-^@M-^Y key exchange methods. The + numbers generated by this operation must be further screened + before use. See the MODULI GENERATION section for more + information. + + -M screen + Screen candidate parameters for Diffie-Hellman Group Exchange. + This will accept a list of candidate numbers and test that they + are safe (Sophie Germain) primes with acceptable group + generators. The results of this operation may be added to the + /etc/moduli file. See the MODULI GENERATION section for more + information. + + -m key_format + Specify a key format for key generation, the -i (import), -e + (export) conversion options, and the -p change passphrase + operation. The latter may be used to convert between OpenSSH + private key and PEM private key formats. The supported key + formats are: M-bM-^@M-^\RFC4716M-bM-^@M-^] (RFC 4716/SSH2 public or private key), + M-bM-^@M-^\PKCS8M-bM-^@M-^] (PKCS8 public or private key) or M-bM-^@M-^\PEMM-bM-^@M-^] (PEM public key). + By default OpenSSH will write newly-generated private keys in its + own format, but when converting public keys for export the + default format is M-bM-^@M-^\RFC4716M-bM-^@M-^]. Setting a format of M-bM-^@M-^\PEMM-bM-^@M-^] when + generating or updating a supported private key type will cause + the key to be stored in the legacy PEM private key format. + + -N new_passphrase + Provides the new passphrase. + + -n principals + Specify one or more principals (user or host names) to be + included in a certificate when signing a key. Multiple + principals may be specified, separated by commas. See the + CERTIFICATES section for details. + + -O option + Specify a key/value option. These are specific to the operation + that ssh-keygen has been requested to perform. + + When signing certificates, one of the options listed in the + CERTIFICATES section may be specified here. + + When performing moduli generation or screening, one of the + options listed in the MODULI GENERATION section may be specified. + + When generating FIDO authenticator-backed keys, the options + listed in the FIDO AUTHENTICATOR section may be specified. + + When changing the passphrase for an existing key, the options + listed in the documentation for the -p flag may be used. + + When performing signature-related options using the -Y flag, the + following options are accepted: + + hashalg=algorithm + Selects the hash algorithm to use for hashing the message + to be signed. Valid algorithms are M-bM-^@M-^\sha256M-bM-^@M-^] and + M-bM-^@M-^\sha512.M-bM-^@M-^] The default is M-bM-^@M-^\sha512.M-bM-^@M-^] + + print-pubkey + Print the full public key to standard output after + signature verification. + + verify-time=timestamp + Specifies a time to use when validating signatures + instead of the current time. The time may be specified + as a date or time in the YYYYMMDD[Z] or in + YYYYMMDDHHMM[SS][Z] formats. Dates and times will be + interpreted in the current system time zone unless + suffixed with a Z character, which causes them to be + interpreted in the UTC time zone. + + When generating SSHFP DNS records from public keys using the -r + flag, the following options are accepted: + + hashalg=algorithm + Selects a hash algorithm to use when printing SSHFP + records using the -D flag. Valid algorithms are M-bM-^@M-^\sha1M-bM-^@M-^] + and M-bM-^@M-^\sha256M-bM-^@M-^]. The default is to print both. + + The -O option may be specified multiple times. + + -P passphrase + Provides the (old) passphrase. + + -p Requests changing the passphrase of a private key file instead of + creating a new private key. The program will prompt for the file + containing the private key, for the old passphrase, and twice for + the new passphrase. + + Updating the passphrase will cause encrypted keys to be + reencrypted, allowing the cipher and/or number of KDF rounds (the + -Z and -a options respectively) to be changed. + + This option may also be used to set or clear FIDO related options + via the -O flag. The following FIDO options may be modified: + + touch-required + no-touch-required + Add or remove the requirement that signatures made using + this key include demonstration of user presence (e.g. by + having the user touch the authenticator). + + verify-required + no-verify-required + Add or remove the requirement for signatures made using + this key to first verify the user identity, e.g. by PIN + or on-token biometrics. + + -Q Test whether keys have been revoked in a KRL. If the -l option + is also specified then the contents of the KRL will be printed. + + -q Silence ssh-keygen. + + -R hostname | [hostname]:port + Removes all keys belonging to the specified hostname (with + optional port number) from a known_hosts file. This option is + useful to delete hashed hosts (see the -H option above). + + -r hostname + Print the SSHFP fingerprint resource record named hostname for + the specified public key file. + + -s ca_key + Certify (sign) a public key using the specified CA key. See the + CERTIFICATES section for details. + + When generating a KRL, -s specifies a path to a CA public key + file used to revoke certificates directly by key ID or serial + number. See the KEY REVOCATION LISTS section for details. + + -t ecdsa | ecdsa-sk | ed25519 | ed25519-sk | mldsa44-ed25519 | rsa + Specifies the type of key to create. The possible values are + M-bM-^@M-^\ecdsaM-bM-^@M-^], M-bM-^@M-^\ecdsa-skM-bM-^@M-^], M-bM-^@M-^\ed25519 (the default),M-bM-^@M-^] M-bM-^@M-^\ed25519-skM-bM-^@M-^], + M-bM-^@M-^\mldsa44-ed25519M-bM-^@M-^] or M-bM-^@M-^\rsaM-bM-^@M-^]. + + This flag may also be used to specify the desired signature type + when signing certificates using an RSA CA key. The available RSA + signature variants are M-bM-^@M-^\ssh-rsaM-bM-^@M-^] (SHA1 signatures, not + recommended), M-bM-^@M-^\rsa-sha2-256M-bM-^@M-^], and M-bM-^@M-^\rsa-sha2-512M-bM-^@M-^] (the default for + RSA keys). + + -U When used in combination with -s or -Y sign, this option + indicates that a CA key resides in an ssh-agent(1). See the + CERTIFICATES section for more information. + + -u Update a KRL. When specified with -k, keys listed via the + command line are added to the existing KRL rather than a new KRL + being created. + + -V validity_interval + Specify a validity interval when signing a certificate. A + validity interval may consist of a single time, indicating that + the certificate is valid beginning now and expiring at that time, + or may consist of two times separated by a colon to indicate an + explicit time interval. + + The start time may be specified as: + M-bM-^@M-M-bM-^@M-" The string M-bM-^@M-^\alwaysM-bM-^@M-^] to indicate the certificate has no + specified start time. + M-bM-^@M-M-bM-^@M-" A date or time in the system time zone formatted as YYYYMMDD + or YYYYMMDDHHMM[SS]. + M-bM-^@M-M-bM-^@M-" A date or time in the UTC time zone as YYYYMMDDZ or + YYYYMMDDHHMM[SS]Z. + M-bM-^@M-M-bM-^@M-" A relative time before the current system time consisting of + a minus sign followed by an interval in the format described + in the TIME FORMATS section of sshd_config(5). + M-bM-^@M-M-bM-^@M-" A raw seconds since epoch (Jan 1 1970 00:00:00 UTC) as a + hexadecimal number beginning with M-bM-^@M-^\0xM-bM-^@M-^]. + + The end time may be specified similarly to the start time: + M-bM-^@M-M-bM-^@M-" The string M-bM-^@M-^\foreverM-bM-^@M-^] to indicate the certificate has no + specified end time. + M-bM-^@M-M-bM-^@M-" A date or time in the system time zone formatted as YYYYMMDD + or YYYYMMDDHHMM[SS]. + M-bM-^@M-M-bM-^@M-" A date or time in the UTC time zone as YYYYMMDDZ or + YYYYMMDDHHMM[SS]Z. + M-bM-^@M-M-bM-^@M-" A relative time after the current system time consisting of a + plus sign followed by an interval in the format described in + the TIME FORMATS section of sshd_config(5). + M-bM-^@M-M-bM-^@M-" A raw seconds since epoch (Jan 1 1970 00:00:00 UTC) as a + hexadecimal number beginning with M-bM-^@M-^\0xM-bM-^@M-^]. + + For example: + + +52w1d Valid from now to 52 weeks and one day from now. + + -4w:+4w + Valid from four weeks ago to four weeks from now. + + 20100101123000:20110101123000 + Valid from 12:30 PM, January 1st, 2010 to 12:30 PM, + January 1st, 2011. + + 20100101123000Z:20110101123000Z + Similar, but interpreted in the UTC time zone rather than + the system time zone. + + -1d:20110101 + Valid from yesterday to midnight, January 1st, 2011. + + 0x1:0x2000000000 + Valid from roughly early 1970 to May 2033. + + -1m:forever + Valid from one minute ago and never expiring. + + -v Verbose mode. Causes ssh-keygen to print debugging messages + about its progress. This is helpful for debugging moduli + generation. Multiple -v options increase the verbosity. The + maximum is 3. + + -w provider + Specifies a path to a library that will be used when creating + FIDO authenticator-hosted keys, overriding the default of using + the internal USB HID support. + + -Y find-principals + Find the principal(s) associated with the public key of a + signature, provided using the -s flag in an authorized signers + file provided using the -f flag. The format of the allowed + signers file is documented in the ALLOWED SIGNERS section below. + If one or more matching principals are found, they are returned + on standard output. + + -Y match-principals + Find principal matching the principal name provided using the -I + flag in the authorized signers file specified using the -f flag. + If one or more matching principals are found, they are returned + on standard output. + + -Y check-novalidate + Checks that a signature generated using ssh-keygen -Y sign has a + valid structure. This does not validate if a signature comes + from an authorized signer. When testing a signature, ssh-keygen + accepts a message on standard input and a signature namespace + using -n. A file containing the corresponding signature must + also be supplied using the -s flag. Successful testing of the + signature is signalled by ssh-keygen returning a zero exit + status. + + -Y sign + Cryptographically sign a file or some data using an SSH key. + When signing, ssh-keygen accepts zero or more files to sign on + the command-line - if no files are specified then ssh-keygen will + sign data presented on standard input. Signatures are written to + the path of the input file with M-bM-^@M-^\.sigM-bM-^@M-^] appended, or to standard + output if the message to be signed was read from standard input. + + The key used for signing is specified using the -f option and may + refer to either a private key, or a public key with the private + half available via ssh-agent(1). An additional signature + namespace, used to prevent signature confusion across different + domains of use (e.g. file signing vs email signing) must be + provided via the -n flag. Namespaces are arbitrary strings, and + may include: M-bM-^@M-^\fileM-bM-^@M-^] for file signing, M-bM-^@M-^\emailM-bM-^@M-^] for email signing. + For custom uses, it is recommended to use names following a + NAMESPACE@YOUR.DOMAIN pattern to generate unambiguous namespaces. + + -Y verify + Request to verify a signature generated using ssh-keygen -Y sign + as described above. When verifying a signature, ssh-keygen + accepts a message on standard input and a signature namespace + using -n. A file containing the corresponding signature must + also be supplied using the -s flag, along with the identity of + the signer using -I and a list of allowed signers via the -f + flag. The format of the allowed signers file is documented in + the ALLOWED SIGNERS section below. A file containing revoked + keys can be passed using the -r flag. The revocation file may be + a KRL or a one-per-line list of public keys. Successful + verification by an authorized signer is signalled by ssh-keygen + returning a zero exit status. + + -y This option will read a private OpenSSH format file and print an + OpenSSH public key to stdout. + + -Z cipher + Specifies the cipher to use for encryption when writing an + OpenSSH-format private key file. The list of available ciphers + may be obtained using "ssh -Q cipher". The default is + M-bM-^@M-^\aes256-ctrM-bM-^@M-^]. + + -z serial_number + Specifies a serial number to be embedded in the certificate to + distinguish this certificate from others from the same CA. If + the serial_number is prefixed with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the + serial number will be incremented for each certificate signed on + a single command-line. The default serial number is zero. + + When generating a KRL, the -z flag is used to specify a KRL + version number. + +MODULI GENERATION + ssh-keygen may be used to generate groups for the Diffie-Hellman Group + Exchange (DH-GEX) protocol. Generating these groups is a two-step + process: first, candidate primes are generated using a fast, but memory + intensive process. These candidate primes are then tested for + suitability (a CPU-intensive process). + + Generation of primes is performed using the -M generate option. The + desired length of the primes may be specified by the -O bits option. For + example: + + # ssh-keygen -M generate -O bits=2048 moduli-2048.candidates + + By default, the search for primes begins at a random point in the desired + length range. This may be overridden using the -O start option, which + specifies a different start point (in hex). + + Once a set of candidates have been generated, they must be screened for + suitability. This may be performed using the -M screen option. In this + mode ssh-keygen will read candidates from standard input (or a file + specified using the -f option). For example: + + # ssh-keygen -M screen -f moduli-2048.candidates moduli-2048 + + By default, each candidate will be subjected to 100 primality tests. + This may be overridden using the -O prime-tests option. The DH generator + value will be chosen automatically for the prime under consideration. If + a specific generator is desired, it may be requested using the -O + generator option. Valid generator values are 2, 3, and 5. + + Screened DH groups may be installed in /etc/moduli. It is important that + this file contains moduli of a range of bit lengths. + + A number of options are available for moduli generation and screening via + the -O flag: + + lines=number + Exit after screening the specified number of lines while + performing DH candidate screening. + + start-line=line-number + Start screening at the specified line number while performing DH + candidate screening. + + checkpoint=filename + Write the last line processed to the specified file while + performing DH candidate screening. This will be used to skip + lines in the input file that have already been processed if the + job is restarted. + + start=hex-value + Specify start point (in hex) when generating candidate moduli for + DH-GEX. + + generator=value + Specify desired generator (in decimal) when testing candidate + moduli for DH-GEX. + +CERTIFICATES + ssh-keygen supports signing of keys to produce certificates that may be + used for user or host authentication. Certificates consist of a public + key, some identity information, zero or more principal (user or host) + names and a set of options that are signed by a Certification Authority + (CA) key. Clients or servers may then trust only the CA key and verify + its signature on a certificate rather than trusting many user/host keys. + Note that OpenSSH certificates are a different, and much simpler, format + to the X.509 certificates used in ssl(8). + + ssh-keygen supports two types of certificates: user and host. User + certificates authenticate users to servers, whereas host certificates + authenticate server hosts to users. To generate a user certificate: + + $ ssh-keygen -s /path/to/ca_key -I id -n user \ + M-BM- M-BM- M-BM- M-BM- M-BM- M-BM- /path/to/user_key.pub + + The resultant certificate will be placed in /path/to/user_key-cert.pub. + The argument to -I is a key identifier that will be used in logs and may + be used to revoke keys. The argument to -n is one or more (comma- + separated) principals, typically usernames, that the certificate + represents. A host certificate requires the -h option: + + $ ssh-keygen -s /path/to/ca_key -I id -h -n foo.example.org \ + M-BM- M-BM- M-BM- M-BM- M-BM- M-BM- /path/to/host_key.pub + + For host certificates, the principals specified using the -n argument are + hostnames and may contain wildcard characters. + + The host certificate will be output to /path/to/host_key-cert.pub. + + It is possible to sign using a CA key stored in a PKCS#11 token by + providing the token library using -D and identifying the CA key by + providing its public half as an argument to -s: + + $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I id -n user \ + M-BM- M-BM- M-BM- M-BM- M-BM- M-BM- user_key.pub + + Similarly, it is possible for the CA key to be hosted in an ssh-agent(1). + This is indicated by the -U flag and, again, the CA key must be + identified by its public half. + + $ ssh-keygen -Us ca_key.pub -I id -n user user_key.pub + + In all cases, key_id is a "key identifier" that is logged by the server + when the certificate is used for authentication. + + Certificates are limited to be valid for a set of principal (user/host) + names. To generate a certificate for a specified set of principals: + + $ ssh-keygen -s ca_key -I id -n user1,user2 user_key.pub + $ ssh-keygen -s ca_key -I id -h -n host.domain host_key.pub + + Additional limitations on the validity and use of user certificates may + be specified through certificate options. A certificate option may + disable features of the SSH session, may be valid only when presented + from particular source addresses or may force the use of a specific + command. + + The options that are valid for user certificates are: + + clear Clear all enabled permissions. This is useful for clearing the + default set of permissions so permissions may be added + individually. + + critical:name[=contents] + extension:name[=contents] + Includes an arbitrary certificate critical option or extension. + The specified name should include a domain suffix, e.g. + M-bM-^@M-^\name@example.comM-bM-^@M-^]. If contents is specified then it is included + as the contents of the extension/option encoded as a string, + otherwise the extension/option is created with no contents + (usually indicating a flag). Extensions may be ignored by a + client or server that does not recognise them, whereas unknown + critical options will cause the certificate to be refused. + + force-command=command + Forces the execution of command instead of any shell or command + specified by the user when the certificate is used for + authentication. + + no-agent-forwarding + Disable ssh-agent(1) forwarding (permitted by default). + + no-port-forwarding + Disable port forwarding (permitted by default). + + no-pty Disable PTY allocation (permitted by default). + + no-user-rc + Disable execution of ~/.ssh/rc by sshd(8) (permitted by default). + + no-x11-forwarding + Disable X11 forwarding (permitted by default). + + permit-agent-forwarding + Allows ssh-agent(1) forwarding. + + permit-port-forwarding + Allows port forwarding. + + permit-pty + Allows PTY allocation. + + permit-user-rc + Allows execution of ~/.ssh/rc by sshd(8). + + permit-X11-forwarding + Allows X11 forwarding. + + no-touch-required + Do not require signatures made using this key include + demonstration of user presence (e.g. by having the user touch the + authenticator). This option only makes sense for the FIDO + authenticator algorithms ecdsa-sk and ed25519-sk. + + source-address=address_list + Restrict the source addresses from which the certificate is + considered valid. The address_list is a comma-separated list of + one or more address/netmask pairs in CIDR format. + + verify-required + Require signatures made using this key indicate that the user was + first verified, e.g. by PIN or on-token biometrics. This option + only makes sense for the FIDO authenticator algorithms ecdsa-sk + and ed25519-sk. + + At present, no standard options are valid for host keys. + + Finally, certificates may be defined with a validity lifetime. The -V + option allows specification of certificate start and end times. A + certificate that is presented at a time outside this range will not be + considered valid. By default, certificates are valid from the Unix Epoch + to the distant future. + + For certificates to be used for user or host authentication, the CA + public key must be trusted by sshd(8) or ssh(1). Refer to those manual + pages for details. + +FIDO AUTHENTICATOR + ssh-keygen is able to generate FIDO authenticator-backed keys, after + which they may be used much like any other key type supported by OpenSSH, + so long as the hardware authenticator is attached when the keys are used. + FIDO authenticators generally require the user to explicitly authorise + operations by touching or tapping them. FIDO keys consist of two parts: + a key handle part stored in the private key file on disk, and a per- + device private key that is unique to each FIDO authenticator and that + cannot be exported from the authenticator hardware. These are combined + by the hardware at authentication time to derive the real key that is + used to sign authentication challenges. Supported key types are ecdsa-sk + and ed25519-sk. + + The options that are valid for FIDO keys are: + + application + Override the default FIDO application/origin string of M-bM-^@M-^\ssh:M-bM-^@M-^]. + This may be useful when generating host or domain-specific + resident keys. The specified application string must begin with + M-bM-^@M-^\ssh:M-bM-^@M-^]. + + challenge=path + Specifies a path to a challenge string that will be passed to the + FIDO authenticator during key generation. The challenge string + may be used as part of an out-of-band protocol for key enrollment + (a random challenge is used by default). + + device Explicitly specify a fido(4) device to use, rather than letting + the authenticator middleware select one. + + no-touch-required + Indicate that the generated private key should not require touch + events (user presence) when making signatures. Note that sshd(8) + will refuse such signatures by default, unless overridden via an + authorized_keys option. + + resident + Indicate that the key handle should be stored on the FIDO + authenticator itself. This makes it easier to use the + authenticator on multiple computers. Resident keys may be + supported on FIDO2 authenticators and typically require that a + PIN be set on the authenticator prior to generation. Resident + keys may be loaded off the authenticator using ssh-add(1). + Storing both parts of a key on a FIDO authenticator increases the + likelihood of an attacker being able to use a stolen + authenticator device. + + user A username to be associated with a resident key, overriding the + empty default username. Specifying a username may be useful when + generating multiple resident keys for the same application name. + + verify-required + Indicate that this private key should require user verification + for each signature. Not all FIDO authenticators support this + option. Currently PIN authentication is the only supported + verification method, but other methods may be supported in the + future. + + write-attestation=path + May be used at key generation time to record the attestation data + returned from FIDO authenticators during key generation. This + information is potentially sensitive. By default, this + information is discarded. + +KEY REVOCATION LISTS + ssh-keygen is able to manage OpenSSH format Key Revocation Lists (KRLs). + These binary files specify keys or certificates to be revoked using a + compact format, taking as little as one bit per certificate if they are + being revoked by serial number. + + KRLs may be generated using the -k flag. This option reads one or more + files from the command line and generates a new KRL. The files may + either contain a KRL specification (see below) or public keys, listed one + per line. Plain public keys are revoked by listing their hash or + contents in the KRL and certificates revoked by serial number or key ID + (if the serial is zero or not available). + + Revoking keys using a KRL specification offers explicit control over the + types of record used to revoke keys and may be used to directly revoke + certificates by serial number or key ID without having the complete + original certificate on hand. A KRL specification consists of lines + containing one of the following directives followed by a colon and some + directive-specific information. + + serial: serial_number[-serial_number] + Revokes a certificate with the specified serial number. Serial + numbers are 64-bit values, not including zero and may be + expressed in decimal, hex or octal. If two serial numbers are + specified separated by a hyphen, then the range of serial numbers + including and between each is revoked. The CA key must have been + specified on the ssh-keygen command line using the -s option. + + id: key_id + Revokes a certificate with the specified key ID string. The CA + key must have been specified on the ssh-keygen command line using + the -s option. + + key: public_key + Revokes the specified key. If a certificate is listed, then it + is revoked as a plain public key. + + sha1: public_key + Revokes the specified key by including its SHA1 hash in the KRL. + + sha256: public_key + Revokes the specified key by including its SHA256 hash in the + KRL. KRLs that revoke keys by SHA256 hash are not supported by + OpenSSH versions prior to 7.9. + + hash: fingerprint + Revokes a key using a fingerprint hash, as obtained from an + sshd(8) authentication log message or the ssh-keygen -l flag. + Only SHA256 fingerprints are supported here and resultant KRLs + are not supported by OpenSSH versions prior to 7.9. + + KRLs may be updated using the -u flag in addition to -k. When this + option is specified, keys listed via the command line are merged into the + KRL, adding to those already there. + + It is also possible, given a KRL, to test whether it revokes a particular + key (or keys). The -Q flag will query an existing KRL, testing each key + specified on the command line. If any key listed on the command line has + been revoked (or an error encountered) then ssh-keygen will exit with a + non-zero exit status. A zero exit status will only be returned if no key + was revoked. + +ALLOWED SIGNERS + When verifying signatures, ssh-keygen uses a simple list of identities + and keys to determine whether a signature comes from an authorized + source. This "allowed signers" file uses a format patterned after the + AUTHORIZED_KEYS FILE FORMAT described in sshd(8). Each line of the file + contains the following space-separated fields: principals, options, + keytype, base64-encoded key. Empty lines and lines starting with a M-bM-^@M-^X#M-bM-^@M-^Y + are ignored as comments. + + The principals field is a pattern-list (see PATTERNS in ssh_config(5)) + consisting of one or more comma-separated USER@DOMAIN identity patterns + that are accepted for signing. When verifying, the identity presented + via the -I option must match a principals pattern in order for the + corresponding key to be considered acceptable for verification. + + The options (if present) consist of comma-separated option + specifications. No spaces are permitted, except within double quotes. + The following option specifications are supported (note that option + keywords are case-insensitive): + + cert-authority + Indicates that this key is accepted as a certificate authority + (CA) and that certificates signed by this CA may be accepted for + verification. + + namespaces=namespace-list + Specifies a pattern-list of namespaces that are accepted for this + key. If this option is present, the signature namespace embedded + in the signature object and presented on the verification + command-line must match the specified list before the key will be + considered acceptable. + + valid-after=timestamp + Indicates that the key is valid for use at or after the specified + timestamp, which may be a date or time in the YYYYMMDD[Z] or + YYYYMMDDHHMM[SS][Z] formats. Dates and times will be interpreted + in the current system time zone unless suffixed with a Z + character, which causes them to be interpreted in the UTC time + zone. + + valid-before=timestamp + Indicates that the key is valid for use at or before the + specified timestamp. + + When verifying signatures made by certificates, the expected principal + name must match both the principals pattern in the allowed signers file + and the principals embedded in the certificate itself. + + An example allowed signers file: + + # Comments allowed at start of line + user1@example.com,user2@example.com ssh-rsa AAAAX1... + # A certificate authority, trusted for all principals in a domain. + *@example.com cert-authority ssh-ed25519 AAAB4... + # A key that is accepted only for file signing. + user2@example.com namespaces="file" ssh-ed25519 AAA41... + +ENVIRONMENT + SSH_SK_PROVIDER + Specifies a path to a library that will be used when loading any + FIDO authenticator-hosted keys, overriding the default of using + the built-in USB HID support. + +FILES + ~/.ssh/id_ecdsa + ~/.ssh/id_ecdsa_sk + ~/.ssh/id_ed25519 + ~/.ssh/id_ed25519_sk + ~/.ssh/id_mldsa44_ed25519 + ~/.ssh/id_rsa + Contains the ECDSA, authenticator-hosted ECDSA, Ed25519, + authenticator-hosted Ed25519 or RSA authentication identity of + the user. This file should not be readable by anyone but the + user. It is possible to specify a passphrase when generating the + key; that passphrase will be used to encrypt the private part of + this file using 128-bit AES. This file is not automatically + accessed by ssh-keygen but it is offered as the default file for + the private key. ssh(1) will read this file when a login attempt + is made. + + ~/.ssh/id_ecdsa.pub + ~/.ssh/id_ecdsa_sk.pub + ~/.ssh/id_ed25519.pub + ~/.ssh/id_ed25519_sk.pub + ~/.ssh/id_mldsa44_ed25519.pub + ~/.ssh/id_rsa.pub + Contains the ECDSA, authenticator-hosted ECDSA, Ed25519, + authenticator-hosted Ed25519 or RSA public key for + authentication. The contents of this file should be added to + ~/.ssh/authorized_keys on all machines where the user wishes to + log in using public key authentication. There is no need to keep + the contents of this file secret. + + /etc/moduli + Contains Diffie-Hellman groups used for DH-GEX. The file format + is described in moduli(5). + +SEE ALSO + ssh(1), ssh-add(1), ssh-agent(1), moduli(5), sshd(8) + + The Secure Shell (SSH) Public Key File Format, RFC 4716, 2006. + +AUTHORS + OpenSSH is a derivative of the original and free ssh 1.2.12 release by + Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo + de Raadt and Dug Song removed many bugs, re-added newer features and + created OpenSSH. Markus Friedl contributed the support for SSH protocol + versions 1.5 and 2.0. + +OpenBSD 8.0 August 7, 2026 SSH-KEYGEN(1) diff --git a/ssh-keygen.c b/ssh-keygen.c index e3692c6739b4..40561c1dbea5 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.492 2026/06/30 23:55:32 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.493 2026/08/07 05:49:53 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -206,13 +206,8 @@ type_bits_valid(int type, const char *name, uint32_t *bitsp) break; case KEY_ECDSA: if (sshkey_ecdsa_bits_to_nid(*bitsp) == -1) -#ifdef OPENSSL_HAS_NISTP521 fatal("Invalid ECDSA key length: valid lengths are " "256, 384 or 521 bits"); -#else - fatal("Invalid ECDSA key length: valid lengths are " - "256 or 384 bits"); -#endif } #endif } @@ -251,7 +246,6 @@ ask_filename(struct passwd *pw, const char *prompt) name = _PATH_SSH_CLIENT_ID_ED25519; else { switch (sshkey_type_from_shortname(key_type_name)) { -#ifdef OPENSSL_HAS_ECC case KEY_ECDSA_CERT: case KEY_ECDSA: name = _PATH_SSH_CLIENT_ID_ECDSA; @@ -260,7 +254,6 @@ ask_filename(struct passwd *pw, const char *prompt) case KEY_ECDSA_SK: name = _PATH_SSH_CLIENT_ID_ECDSA_SK; break; -#endif case KEY_RSA_CERT: case KEY_RSA: name = _PATH_SSH_CLIENT_ID_RSA; @@ -364,13 +357,11 @@ do_convert_to_pkcs8(struct sshkey *k) EVP_PKEY_get0_RSA(k->pkey))) fatal("PEM_write_RSA_PUBKEY failed"); break; -#ifdef OPENSSL_HAS_ECC case KEY_ECDSA: if (!PEM_write_EC_PUBKEY(stdout, EVP_PKEY_get0_EC_KEY(k->pkey))) fatal("PEM_write_EC_PUBKEY failed"); break; -#endif default: fatal_f("unsupported key type %s", sshkey_type(k)); } @@ -385,13 +376,11 @@ do_convert_to_pem(struct sshkey *k) EVP_PKEY_get0_RSA(k->pkey))) fatal("PEM_write_RSAPublicKey failed"); break; -#ifdef OPENSSL_HAS_ECC case KEY_ECDSA: if (!PEM_write_EC_PUBKEY(stdout, EVP_PKEY_get0_EC_KEY(k->pkey))) fatal("PEM_write_EC_PUBKEY failed"); break; -#endif default: fatal_f("unsupported key type %s", sshkey_type(k)); } @@ -673,7 +662,6 @@ do_convert_from_pkcs8(struct sshkey **k, int *private) (*k)->pkey = pubkey; pubkey = NULL; break; -#ifdef OPENSSL_HAS_ECC case EVP_PKEY_EC: if ((*k = sshkey_new(KEY_UNSPEC)) == NULL) fatal("sshkey_new failed"); @@ -683,7 +671,6 @@ do_convert_from_pkcs8(struct sshkey **k, int *private) (*k)->pkey = pubkey; pubkey = NULL; break; -#endif default: fatal_f("unsupported pubkey type %d", EVP_PKEY_base_id(pubkey)); @@ -747,13 +734,11 @@ do_convert_from(struct passwd *pw) fprintf(stdout, "\n"); } else { switch (k->type) { -#ifdef OPENSSL_HAS_ECC case KEY_ECDSA: ok = PEM_write_ECPrivateKey(stdout, EVP_PKEY_get0_EC_KEY(k->pkey), NULL, NULL, 0, NULL, NULL); break; -#endif case KEY_RSA: ok = PEM_write_RSAPrivateKey(stdout, EVP_PKEY_get0_RSA(k->pkey), NULL, NULL, 0, @@ -1014,9 +999,7 @@ do_gen_all_hostkeys(struct passwd *pw) } key_types[] = { #ifdef WITH_OPENSSL { "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, -#ifdef OPENSSL_HAS_ECC { "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE }, -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ { "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE }, #ifdef USE_MLDSA @@ -1366,13 +1349,14 @@ do_known_hosts(struct passwd *pw, const char *name, int find_host, * for the current user. */ static void -do_change_passphrase(struct passwd *pw) +do_change_passphrase(struct passwd *pw, char * const *opts, size_t nopts) { char *comment; char *old_passphrase, *passphrase1, *passphrase2; struct stat st; struct sshkey *private; int r; + size_t i; if (!have_identity) ask_filename(pw, "Enter file in which the key is"); @@ -1399,6 +1383,38 @@ do_change_passphrase(struct passwd *pw) if (comment) mprintf("Key has comment '%s'\n", comment); + /* All current -O options relate to FIDO keys only */ + if (nopts != 0 && !sshkey_is_sk(private)) { + fatal("FIDO-specific option requested for non-FIDO key %s", + identity_file); + } + if (sshkey_is_sk(private)) { + debug_f("%s: original FIDO key flags: " + "%stouch-required %sverify-required", identity_file, + (private->sk_flags & SSH_SK_USER_PRESENCE_REQD) ? "": "no-", + (private->sk_flags & SSH_SK_USER_VERIFICATION_REQD) ? "" : "no-"); + } + for (i = 0; i < nopts; i++) { + if (strcasecmp(opts[i], "touch-required") == 0) + private->sk_flags |= SSH_SK_USER_PRESENCE_REQD; + else if (strcasecmp(opts[i], "no-touch-required") == 0) + private->sk_flags &= ~SSH_SK_USER_PRESENCE_REQD; + else if (strcasecmp(opts[i], "verify-required") == 0) + private->sk_flags |= SSH_SK_USER_VERIFICATION_REQD; + else if (strcasecmp(opts[i], "no-verify-required") == 0) + private->sk_flags &= ~SSH_SK_USER_VERIFICATION_REQD; + else { + fatal("Option \"%s\" is unsupported for " + "key passphrase change", opts[i]); + } + } + if (sshkey_is_sk(private) && nopts != 0) { + debug_f("%s: updated FIDO key flags: " + "%stouch-required %sverify-required", identity_file, + (private->sk_flags & SSH_SK_USER_PRESENCE_REQD) ? "": "no-", + (private->sk_flags & SSH_SK_USER_VERIFICATION_REQD) ? "" : "no-"); + } + /* Ask the new passphrase (twice). */ if (identity_new_passphrase) { passphrase1 = xstrdup(identity_new_passphrase); @@ -3711,7 +3727,7 @@ main(int argc, char **argv) if (print_fingerprint || print_bubblebabble) do_fingerprint(pw); if (change_passphrase) - do_change_passphrase(pw); + do_change_passphrase(pw, opts, nopts); if (change_comment) do_change_comment(pw, identity_comment); #ifdef WITH_OPENSSL diff --git a/ssh-keyscan.0 b/ssh-keyscan.0 new file mode 100644 index 000000000000..63d44c6894cf --- /dev/null +++ b/ssh-keyscan.0 @@ -0,0 +1,129 @@ +SSH-KEYSCAN(1) General Commands Manual SSH-KEYSCAN(1) + +NAME + ssh-keyscan M-bM-^@M-^S gather SSH public keys from servers + +SYNOPSIS + ssh-keyscan [-46cDHqv] [-f file] [-O option] [-p port] [-T timeout] + [-t type] [host | addrlist namelist] + +DESCRIPTION + ssh-keyscan is a utility for gathering the public SSH host keys of a + number of hosts. It was designed to aid in building and verifying + ssh_known_hosts files, the format of which is documented in sshd(8). + ssh-keyscan provides a minimal interface suitable for use by shell and + perl scripts. + + ssh-keyscan uses non-blocking socket I/O to contact as many hosts as + possible in parallel, so it is very efficient. The keys from a domain of + 1,000 hosts can be collected in tens of seconds, even when some of those + hosts are down or do not run sshd(8). For scanning, one does not need + login access to the machines that are being scanned, nor does the + scanning process involve any encryption. + + Hosts to be scanned may be specified by hostname, address or by CIDR + network range (e.g. 192.168.16/28). If a network range is specified, + then all addresses in that range will be scanned. + + ssh-keyscan cannot verify the authenticity of the host keys it obtains, + and an attacker on the network with the ability to intercept traffic + could substitute their own host keys to enable impersonation of servers. + Because of this, ssh-keyscan output should be verified out of band, or + only used directly for host authentication if the network is trusted. + + The options are as follows: + + -4 Force ssh-keyscan to use IPv4 addresses only. + + -6 Force ssh-keyscan to use IPv6 addresses only. + + -c Request certificates from target hosts instead of plain keys. + + -D Print keys found as SSHFP DNS records. The default is to print + keys in a format usable as an ssh(1) known_hosts file. + + -f file + Read hosts or M-bM-^@M-^\addrlist namelistM-bM-^@M-^] pairs from file, one per line. + If M-bM-^@M-^X-M-bM-^@M-^Y is supplied instead of a filename, ssh-keyscan will read + from the standard input. Names read from a file must start with + an address, hostname or CIDR network range to be scanned. + Addresses and hostnames may optionally be followed by comma- + separated name or address aliases that will be copied to the + output. For example: + + 192.168.11.0/24 + 10.20.1.1 + happy.example.org + 10.0.0.1,sad.example.org + + -H Hash all hostnames and addresses in the output. Hashed names may + be used normally by ssh(1) and sshd(8), but they do not reveal + identifying information should the file's contents be disclosed. + + -O option + Specify a key/value option. At present, only a single option is + supported: + + hashalg=algorithm + Selects a hash algorithm to use when printing SSHFP + records using the -D flag. Valid algorithms are M-bM-^@M-^\sha1M-bM-^@M-^] + and M-bM-^@M-^\sha256M-bM-^@M-^]. The default is to print both. + + -p port + Connect to port on the remote host. + + -q Quiet mode: do not print server host name and banners in + comments. + + -T timeout + Set the timeout for connection attempts. If timeout seconds have + elapsed since a connection was initiated to a host or since the + last time anything was read from that host, the connection is + closed and the host in question considered unavailable. The + default is 5 seconds. + + -t type + Specify the type of the key to fetch from the scanned hosts. The + possible values are M-bM-^@M-^\ecdsaM-bM-^@M-^], M-bM-^@M-^\ed25519M-bM-^@M-^], M-bM-^@M-^\ecdsa-skM-bM-^@M-^], M-bM-^@M-^\ed25519-skM-bM-^@M-^], + or M-bM-^@M-^\rsaM-bM-^@M-^]. Multiple values may be specified by separating them + with commas. The default is to fetch all the above key types. + + -v Verbose mode: print debugging messages about progress. + + If an ssh_known_hosts file is constructed using ssh-keyscan without + verifying the keys, users will be vulnerable to man in the middle + attacks. On the other hand, if the security model allows such a risk, + ssh-keyscan can help in the detection of tampered keyfiles or man in the + middle attacks which have begun after the ssh_known_hosts file was + created. + +FILES + /etc/ssh/ssh_known_hosts + +EXAMPLES + Print the RSA host key for machine hostname: + + $ ssh-keyscan -t rsa hostname + + Search a network range, printing all supported key types: + + $ ssh-keyscan 192.168.0.64/25 + + Find all hosts from the file ssh_hosts which have new or different keys + from those in the sorted file ssh_known_hosts: + + $ ssh-keyscan -t rsa,ecdsa,ed25519 -f ssh_hosts | \ + sort -u - ssh_known_hosts | diff ssh_known_hosts - + +SEE ALSO + ssh(1), sshd(8) + + Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints, RFC + 4255, 2006. + +AUTHORS + David Mazieres wrote the initial version, and Wayne + Davison added support for protocol version + 2. + +OpenBSD 8.0 June 26, 2026 SSH-KEYSCAN(1) diff --git a/ssh-keyscan.c b/ssh-keyscan.c index ddaf8dfb1de5..f093b0108188 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.168 2026/06/14 03:59:34 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.170 2026/08/10 23:24:03 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres . * @@ -110,6 +110,9 @@ typedef struct Connection { char *c_namelist; /* Pointer to other possible addresses */ char *c_output_name; /* Hostname of connection for output */ struct ssh *c_ssh; /* SSH-connection */ + char c_banner[256]; /* Partial server greeting */ + size_t c_banner_len; /* Length of partial server greeting */ + int c_banner_sent; /* Client greeting has been sent */ struct timespec c_ts; /* Time at which connection gets aborted */ TAILQ_ENTRY(Connection) c_link; /* List of connections in timeout order. */ } con; @@ -290,13 +293,12 @@ keygrab_ssh2(con *c) c->c_ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_client; c->c_ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; c->c_ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; -# ifdef OPENSSL_HAS_ECC c->c_ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client; -# endif #endif c->c_ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_client; c->c_ssh->kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_client; c->c_ssh->kex->kex[KEX_KEM_MLKEM768X25519_SHA256] = kex_gen_client; + c->c_ssh->kex->kex[KEX_KEM_MLKEM768ECDH_SHA256] = kex_gen_client; ssh_set_verify_host_key_callback(c->c_ssh, key_print_wrapper); /* * do the key-exchange until an error occurs or until @@ -414,6 +416,8 @@ conalloc(const char *iname, const char *oname, int keytype) fdcon[s].c_namelist = namelist; fdcon[s].c_output_name = xstrdup(oname); fdcon[s].c_keytype = keytype; + fdcon[s].c_banner_len = 0; + fdcon[s].c_banner_sent = 0; monotime_ts(&fdcon[s].c_ts); fdcon[s].c_ts.tv_sec += timeout; TAILQ_INSERT_TAIL(&tq, &fdcon[s], c_link); @@ -458,52 +462,48 @@ conrecycle(int s) static void congreet(int s) { - int n = 0, remote_major = 0, remote_minor = 0; - char buf[256], *cp; + int remote_major = 0, remote_minor = 0; + ssize_t n; + char buf[256], ch; char remote_version[sizeof buf]; - size_t bufsiz; con *c = &fdcon[s]; - /* send client banner */ - n = snprintf(buf, sizeof buf, "SSH-%d.%d-OpenSSH-keyscan\r\n", - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2); - if (n < 0 || (size_t)n >= sizeof(buf)) { - error("snprintf: buffer too small"); - confree(s); - return; - } - if (atomicio(vwrite, s, buf, n) != (size_t)n) { - error("write (%s): %s", c->c_name, strerror(errno)); - confree(s); - return; + if (!c->c_banner_sent) { + /* send client banner */ + n = snprintf(buf, sizeof buf, "SSH-%d.%d-OpenSSH-keyscan\r\n", + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2); + if (n < 0 || (size_t)n >= sizeof(buf)) { + error("snprintf: buffer too small"); + confree(s); + return; + } + if (atomicio(vwrite, s, buf, n) != (size_t)n) { + error("write (%s): %s", c->c_name, strerror(errno)); + confree(s); + return; + } + c->c_banner_sent = 1; } /* * Read the server banner as per RFC4253 section 4.2. The "SSH-" * protocol identification string may be preceded by an arbitrarily - * large banner which we must read and ignore. Loop while reading - * newline-terminated lines until we have one starting with "SSH-". - * The ID string cannot be longer than 255 characters although the - * preceding banner lines may (in which case they'll be discarded - * in multiple iterations of the outer loop). + * large banner which we must read and ignore. Read a single byte + * at a time so that the event loop retains control of connection + * timeouts. Partial lines are retained in the connection state + * between calls. */ - for (;;) { - memset(buf, '\0', sizeof(buf)); - bufsiz = sizeof(buf); - cp = buf; - while (bufsiz-- && - (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') { - if (*cp == '\r') - *cp = '\n'; - cp++; - } - if (n != 1 || strncmp(buf, "SSH-", 4) == 0) - break; - } - if (n == 0) { + n = read(s, &ch, sizeof(ch)); + if (n == -1 && (errno == EAGAIN || errno == EWOULDBLOCK || + errno == EINTR)) + return; + if (n != 1) { + if (n == 0) + errno = EPIPE; switch (errno) { case EPIPE: - error("%s: Connection closed by remote host", c->c_name); + error("%s: Connection closed by remote host", + c->c_name); break; case ECONNREFUSED: break; @@ -514,17 +514,28 @@ congreet(int s) conrecycle(s); return; } - if (cp >= buf + sizeof(buf)) { - error("%s: greeting exceeds allowable length", c->c_name); - confree(s); + c->c_banner[c->c_banner_len++] = ch == '\r' ? '\n' : ch; + if (ch != '\n') { + if (c->c_banner_len < sizeof(c->c_banner) - 1) + return; /* incomplete line */ + if (strncmp(c->c_banner, "SSH-", 4) == 0) { + /* banner exceeds RFC 4253 s4.2 length limit */ + error("%s: greeting exceeds allowable length", + c->c_name); + confree(s); + return; + } + /* Discard an oversized pre-identification banner chunk. */ + c->c_banner_len = 0; return; } - if (*cp != '\n' && *cp != '\r') { - error("%s: bad greeting", c->c_name); - confree(s); + if (strncmp(c->c_banner, "SSH-", 4) != 0) { + /* Ignore non-banner lines */ + c->c_banner_len = 0; return; } - *cp = '\0'; + c->c_banner[c->c_banner_len++] = '\0'; + memcpy(buf, c->c_banner, c->c_banner_len); if ((c->c_ssh = ssh_packet_set_connection(NULL, s, s)) == NULL) fatal("ssh_packet_set_connection failed"); ssh_packet_set_timeout(c->c_ssh, timeout, 1); diff --git a/ssh-keysign.0 b/ssh-keysign.0 new file mode 100644 index 000000000000..eafd47b5619a --- /dev/null +++ b/ssh-keysign.0 @@ -0,0 +1,52 @@ +SSH-KEYSIGN(8) System Manager's Manual SSH-KEYSIGN(8) + +NAME + ssh-keysign M-bM-^@M-^S OpenSSH helper for host-based authentication + +SYNOPSIS + ssh-keysign + +DESCRIPTION + ssh-keysign is used by ssh(1) to access the local host keys and generate + the digital signature required during host-based authentication. + + ssh-keysign is disabled by default and can only be enabled in the global + client configuration file /etc/ssh/ssh_config by setting EnableSSHKeysign + to M-bM-^@M-^\yesM-bM-^@M-^]. + + ssh-keysign is not intended to be invoked by the user, but from ssh(1). + See ssh(1) and sshd(8) for more information about host-based + authentication. + +FILES + /etc/ssh/ssh_config + Controls whether ssh-keysign is enabled. + + /etc/ssh/ssh_host_ecdsa_key + /etc/ssh/ssh_host_ed25519_key + /etc/ssh/ssh_host_mldsa44_ed25519_key + /etc/ssh/ssh_host_rsa_key + These files contain the private parts of the host keys used to + generate the digital signature. They should be owned by root, + readable only by root, and not accessible to others. Since they + are readable only by root, ssh-keysign must be set-uid root if + host-based authentication is used. + + /etc/ssh/ssh_host_ecdsa_key-cert.pub + /etc/ssh/ssh_host_ed25519_key-cert.pub + /etc/ssh/ssh_host_mldsa44_ed25519_key-cert.pub + /etc/ssh/ssh_host_rsa_key-cert.pub + If these files exist, they are assumed to contain public + certificate information corresponding with the private keys + above. + +SEE ALSO + ssh(1), ssh-keygen(1), ssh_config(5), sshd(8) + +HISTORY + ssh-keysign first appeared in OpenBSD 3.2. + +AUTHORS + Markus Friedl + +OpenBSD 8.0 July 10, 2026 SSH-KEYSIGN(8) diff --git a/ssh-mldsa-eddsa.c b/ssh-mldsa-eddsa.c index 89c35c7d1a00..390b471db14b 100644 --- a/ssh-mldsa-eddsa.c +++ b/ssh-mldsa-eddsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-mldsa-eddsa.c,v 1.1 2026/06/14 03:59:34 djm Exp $ */ +/* $OpenBSD: ssh-mldsa-eddsa.c,v 1.4 2026/07/30 07:40:48 brynet Exp $ */ /* * Copyright (c) 2026 Damien Miller * @@ -48,7 +48,8 @@ int crypto_sign_mldsa44_ed25519_keygen(uint8_t pk[MLDSA44_ED25519_PK_SZ], uint8_t sk[MLDSA44_ED25519_SK_SZ]) { - uint8_t mldsa_seed[32], ed25519_seed[32]; + uint8_t mldsa_seed[MLDSA44_SEEDBYTES]; + uint8_t ed25519_seed[crypto_sign_ed25519_SEEDBYTES]; int r; arc4random_buf(mldsa_seed, sizeof(mldsa_seed)); @@ -63,10 +64,12 @@ crypto_sign_mldsa44_ed25519_keygen(uint8_t pk[MLDSA44_ED25519_PK_SZ], int crypto_sign_mldsa44_ed25519_keygen_seeded(uint8_t pk[MLDSA44_ED25519_PK_SZ], - uint8_t sk[MLDSA44_ED25519_SK_SZ], const uint8_t mldsa_seed[32], - const uint8_t ed25519_seed[32]) + uint8_t sk[MLDSA44_ED25519_SK_SZ], + const uint8_t mldsa_seed[MLDSA44_SEEDBYTES], + const uint8_t ed25519_seed[crypto_sign_ed25519_SEEDBYTES]) { - uint8_t ed25519_pk[32], ed25519_sk[64]; + uint8_t ed25519_pk[MLDSA44_SEEDBYTES]; + uint8_t ed25519_sk[crypto_sign_ed25519_SECRETKEYBYTES]; uint8_t mldsa_sk[MLDSA44_SECRETKEYBYTES]; int ret = -1; @@ -77,11 +80,13 @@ crypto_sign_mldsa44_ed25519_keygen_seeded(uint8_t pk[MLDSA44_ED25519_PK_SZ], goto out; /* Serialize PK: mldsaPK || ed25519PK */ - memcpy(pk + MLDSA44_PUBLICKEYBYTES, ed25519_pk, 32); + memcpy(pk + MLDSA44_PUBLICKEYBYTES, ed25519_pk, + crypto_sign_ed25519_SEEDBYTES); /* Serialize SK: mldsaSeed || ed25519Seed */ - memcpy(sk, mldsa_seed, 32); - memcpy(sk + 32, ed25519_seed, 32); + memcpy(sk, mldsa_seed, MLDSA44_SEEDBYTES); + memcpy(sk + MLDSA44_SEEDBYTES, ed25519_seed, + crypto_sign_ed25519_SEEDBYTES); /* success */ ret = 0; @@ -141,8 +146,9 @@ crypto_sign_mldsa44_ed25519_sign(uint8_t sig[MLDSA44_ED25519_SIG_SZ], size_t m_prime_len = 0; uint8_t mldsa_sk[MLDSA44_SECRETKEYBYTES]; uint8_t mldsa_pk_dummy[MLDSA44_PUBLICKEYBYTES]; - uint8_t ed25519_pk[32], ed25519_sk[64]; - uint8_t mldsa_rnd[32]; + uint8_t ed25519_pk[crypto_sign_ed25519_PUBLICKEYBYTES]; + uint8_t ed25519_sk[crypto_sign_ed25519_SECRETKEYBYTES]; + uint8_t mldsa_rnd[MLDSA44_SEEDBYTES]; unsigned long long smlen; int r = -1; @@ -163,11 +169,11 @@ crypto_sign_mldsa44_ed25519_sign(uint8_t sig[MLDSA44_ED25519_SIG_SZ], /* Expand Ed25519 key from seed */ if (crypto_sign_ed25519_keypair_from_seed(ed25519_pk, ed25519_sk, - sk + 32) != 0) + sk + MLDSA44_SEEDBYTES) != 0) goto out; /* Sign with Ed25519 */ - uint8_t *sm = malloc(m_prime_len + 64); + uint8_t *sm = malloc(m_prime_len + crypto_sign_ed25519_BYTES); if (sm == NULL) goto out; @@ -176,7 +182,7 @@ crypto_sign_mldsa44_ed25519_sign(uint8_t sig[MLDSA44_ED25519_SIG_SZ], free(sm); goto out; } - memcpy(sig + MLDSA44_SIGBYTES, sm, 64); + memcpy(sig + MLDSA44_SIGBYTES, sm, crypto_sign_ed25519_BYTES); free(sm); r = 0; @@ -211,12 +217,12 @@ crypto_sign_mldsa44_ed25519_verify(const uint8_t sig[MLDSA44_ED25519_SIG_SZ], goto out; /* Verify Ed25519 */ - smlen = m_prime_len + 64; + smlen = m_prime_len + crypto_sign_ed25519_BYTES; mlen = smlen; if ((sm = malloc(smlen)) == NULL || (m = malloc(mlen)) == NULL) goto out; - memcpy(sm, sig + MLDSA44_SIGBYTES, 64); - memcpy(sm + 64, m_prime, m_prime_len); + memcpy(sm, sig + MLDSA44_SIGBYTES, crypto_sign_ed25519_BYTES); + memcpy(sm + crypto_sign_ed25519_BYTES, m_prime, m_prime_len); if (crypto_sign_ed25519_open(m, &mlen, sm, smlen, pk + MLDSA44_PUBLICKEYBYTES) != 0) @@ -337,19 +343,15 @@ ssh_mldsa44_ed25519_deserialize_private(const char *ktype, struct sshbuf *b, static int ssh_mldsa44_ed25519_generate(struct sshkey *k, int bits) { - free(k->mldsa_ed25519_pk); - free(k->mldsa_ed25519_sk); - k->mldsa_ed25519_pk = NULL; - k->mldsa_ed25519_sk = NULL; + ssh_mldsa44_ed25519_cleanup(k); if ((k->mldsa_ed25519_pk = malloc(MLDSA44_ED25519_PK_SZ)) == NULL || (k->mldsa_ed25519_sk = malloc(MLDSA44_ED25519_SK_SZ)) == NULL) { - free(k->mldsa_ed25519_pk); + ssh_mldsa44_ed25519_cleanup(k); return SSH_ERR_ALLOC_FAIL; } if (crypto_sign_mldsa44_ed25519_keygen(k->mldsa_ed25519_pk, k->mldsa_ed25519_sk) != 0) { - free(k->mldsa_ed25519_pk); - free(k->mldsa_ed25519_sk); + ssh_mldsa44_ed25519_cleanup(k); return SSH_ERR_CRYPTO_ERROR; } return 0; diff --git a/ssh-pkcs11-helper.0 b/ssh-pkcs11-helper.0 new file mode 100644 index 000000000000..e8d20ffb9249 --- /dev/null +++ b/ssh-pkcs11-helper.0 @@ -0,0 +1,35 @@ +SSH-PKCS11-HELPER(8) System Manager's Manual SSH-PKCS11-HELPER(8) + +NAME + ssh-pkcs11-helper M-bM-^@M-^S OpenSSH helper for PKCS#11 support + +SYNOPSIS + ssh-pkcs11-helper [-v] + +DESCRIPTION + ssh-pkcs11-helper is used by ssh(1), ssh-agent(1), and ssh-keygen(1) to + access keys provided by a PKCS#11 token. + + ssh-pkcs11-helper is not intended to be invoked directly by the user. + + A single option is supported: + + -v Verbose mode. Causes ssh-pkcs11-helper to print debugging + messages about its progress. This is helpful in debugging + problems. Multiple -v options increase the verbosity. The + maximum is 3. + + Note that ssh(1), ssh-agent(1), and ssh-keygen(1) will + automatically pass the -v flag to ssh-pkcs11-helper when they + have themselves been placed in debug mode. + +SEE ALSO + ssh(1), ssh-agent(1), ssh-keygen(1) + +HISTORY + ssh-pkcs11-helper first appeared in OpenBSD 4.7. + +AUTHORS + Markus Friedl + +OpenBSD 8.0 April 29, 2022 SSH-PKCS11-HELPER(8) diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c index 7a7d3b8eaa0a..bd45ef090987 100644 --- a/ssh-pkcs11.c +++ b/ssh-pkcs11.c @@ -86,7 +86,7 @@ TAILQ_HEAD(, pkcs11_key) pkcs11_keys; /* XXX a tree would be better */ int pkcs11_interactive = 0; -#if defined(OPENSSL_HAS_ECC) || defined(OPENSSL_HAS_ED25519) +#ifdef WITH_OPENSSL static void ossl_error(const char *msg) { @@ -622,7 +622,6 @@ pkcs11_sign_rsa(struct sshkey *key, return ret; } -#ifdef OPENSSL_HAS_ECC static int pkcs11_sign_ecdsa(struct sshkey *key, u_char **sigp, size_t *lenp, @@ -706,7 +705,6 @@ pkcs11_sign_ecdsa(struct sshkey *key, free(sig); return ret; } -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ static int @@ -849,7 +847,6 @@ pkcs11_key_included(struct sshkey ***keysp, int *nkeys, struct sshkey *key) } #ifdef WITH_OPENSSL -#ifdef OPENSSL_HAS_ECC static struct sshkey * pkcs11_fetch_ecdsa_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, CK_OBJECT_HANDLE *obj) @@ -983,7 +980,6 @@ pkcs11_fetch_ecdsa_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, return (key); } -#endif /* OPENSSL_HAS_ECC */ static struct sshkey * pkcs11_fetch_rsa_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, @@ -1208,18 +1204,14 @@ pkcs11_fetch_x509_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, X509_NAME *x509_name = NULL; EVP_PKEY *evp; RSA *rsa = NULL; - + EC_KEY *ec = NULL; struct sshkey *key = NULL; - int i, success = -1; + int r, i, nid, success = -1; const u_char *cp; char *subject = NULL; #ifdef OPENSSL_HAS_ED25519 size_t len; #endif /* OPENSSL_HAS_ED25519 */ -#ifdef OPENSSL_HAS_ECC - EC_KEY *ec = NULL; - int r, nid; -#endif *keyp = NULL; *labelp = NULL; @@ -1314,7 +1306,6 @@ pkcs11_fetch_x509_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, goto out; /* success */ success = 0; -#ifdef OPENSSL_HAS_ECC } else if (EVP_PKEY_base_id(evp) == EVP_PKEY_EC) { if (EVP_PKEY_get0_EC_KEY(evp) == NULL) { error("invalid x509; no ec key"); @@ -1353,7 +1344,6 @@ pkcs11_fetch_x509_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, goto out; /* success */ success = 0; -#endif /* OPENSSL_HAS_ECC */ #ifdef OPENSSL_HAS_ED25519 } else if (EVP_PKEY_base_id(evp) == EVP_PKEY_ED25519) { if ((key = sshkey_new(KEY_UNSPEC)) == NULL || @@ -1385,9 +1375,7 @@ pkcs11_fetch_x509_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, free(cert_attr[i].pValue); X509_free(x509); RSA_free(rsa); -#ifdef OPENSSL_HAS_ECC EC_KEY_free(ec); -#endif /* OPENSSL_HAS_ECC */ if (success != 0 || key == NULL) { sshkey_free(key); free(subject); @@ -1593,11 +1581,9 @@ pkcs11_fetch_keys(struct pkcs11_provider *p, CK_ULONG slotidx, case CKK_RSA: key = pkcs11_fetch_rsa_pubkey(p, slotidx, &obj); break; -#ifdef OPENSSL_HAS_ECC case CKK_ECDSA: key = pkcs11_fetch_ecdsa_pubkey(p, slotidx, &obj); break; -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ case CKK_EC_EDWARDS: key = pkcs11_fetch_ed25519_pubkey(p, slotidx, &obj); @@ -2071,17 +2057,15 @@ pkcs11_sign(struct sshkey *key, const char *sk_pin, u_int compat) { switch (key->type) { +#ifdef WITH_OPENSSL case KEY_RSA: case KEY_RSA_CERT: -#ifdef WITH_OPENSSL return pkcs11_sign_rsa(key, sigp, lenp, data, datalen, alg, sk_provider, sk_pin, compat); -#ifdef OPENSSL_HAS_ECC case KEY_ECDSA: case KEY_ECDSA_CERT: return pkcs11_sign_ecdsa(key, sigp, lenp, data, datalen, alg, sk_provider, sk_pin, compat); -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ case KEY_ED25519: case KEY_ED25519_CERT: @@ -2246,11 +2230,9 @@ pkcs11_destroy_keypair(char *provider_id, char *pin, unsigned long slotidx, case CKK_RSA: k = pkcs11_fetch_rsa_pubkey(p, slotidx, &obj); break; -#ifdef OPENSSL_HAS_ECC case CKK_ECDSA: k = pkcs11_fetch_ecdsa_pubkey(p, slotidx, &obj); break; -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ case CKK_EC_EDWARDS: k = pkcs11_fetch_ed25519_pubkey(p, slotidx, &obj); diff --git a/ssh-sk-helper.0 b/ssh-sk-helper.0 new file mode 100644 index 000000000000..0a242f33d83b --- /dev/null +++ b/ssh-sk-helper.0 @@ -0,0 +1,34 @@ +SSH-SK-HELPER(8) System Manager's Manual SSH-SK-HELPER(8) + +NAME + ssh-sk-helper M-bM-^@M-^S OpenSSH helper for FIDO authenticator support + +SYNOPSIS + ssh-sk-helper [-v] + +DESCRIPTION + ssh-sk-helper is used by ssh(1), ssh-agent(1), and ssh-keygen(1) to + access keys provided by a FIDO authenticator. + + ssh-sk-helper is not intended to be invoked directly by the user. + + A single option is supported: + + -v Verbose mode. Causes ssh-sk-helper to print debugging messages + about its progress. This is helpful in debugging problems. + Multiple -v options increase the verbosity. The maximum is 3. + + Note that ssh(1), ssh-agent(1), and ssh-keygen(1) will + automatically pass the -v flag to ssh-sk-helper when they have + themselves been placed in debug mode. + +SEE ALSO + ssh(1), ssh-agent(1), ssh-keygen(1) + +HISTORY + ssh-sk-helper first appeared in OpenBSD 6.7. + +AUTHORS + Damien Miller + +OpenBSD 8.0 April 29, 2022 SSH-SK-HELPER(8) diff --git a/ssh-sk.c b/ssh-sk.c index 6bb1edc90b80..aaf72a3f3700 100644 --- a/ssh-sk.c +++ b/ssh-sk.c @@ -27,11 +27,11 @@ #include #include -#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) +#ifdef WITH_OPENSSL #include #include #include -#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */ +#endif /* WITH_OPENSSL */ #include "log.h" #include "misc.h" @@ -44,15 +44,6 @@ #include "sk-api.h" #include "crypto_api.h" -/* - * Almost every use of OpenSSL in this file is for ECDSA-NISTP256. - * This is strictly a larger hammer than necessary, but it reduces changes - * with upstream. - */ -#ifndef OPENSSL_HAS_ECC -# undef WITH_OPENSSL -#endif - struct sshsk_provider { char *path; void *dlhandle; diff --git a/ssh.0 b/ssh.0 new file mode 100644 index 000000000000..a326c8922e36 --- /dev/null +++ b/ssh.0 @@ -0,0 +1,940 @@ +SSH(1) General Commands Manual SSH(1) + +NAME + ssh M-bM-^@M-^S OpenSSH remote login client + +SYNOPSIS + ssh [-46AaCfGgKkMNnqsTtVvXxYyZ] [-B bind_interface] [-b bind_address] + [-c cipher_spec] [-D [bind_address:]port] [-E log_file] + [-e escape_char] [-F configfile] [-I pkcs11] [-i identity_file] + [-J destination] [-L address] [-l login_name] [-m mac_spec] + [-O ctl_cmd] [-o option] [-P tag] [-p port] [-R address] + [-S ctl_path] [-W host:port] [-w local_tun[:remote_tun]] destination + [command [argument ...]] + ssh [-Q query_option] + +DESCRIPTION + ssh (SSH client) is a program for logging into a remote machine and for + executing commands on a remote machine. It is intended to provide secure + encrypted communications between two untrusted hosts over an insecure + network. X11 connections, arbitrary TCP ports and Unix-domain sockets + can also be forwarded over the secure channel. + + ssh connects and logs into the specified destination, which may be + specified as either [user@]hostname or a URI of the form + ssh://[user@]hostname[:port]. The user must prove their identity to the + remote machine using one of several methods (see below). + + If a command is specified, it will be executed on the remote host instead + of a login shell. A complete command line may be specified as command, + or it may have additional arguments. If supplied, the arguments will be + appended to the command, separated by spaces, before it is sent to the + server to be executed. + + The options are as follows: + + -4 Forces ssh to use IPv4 addresses only. + + -6 Forces ssh to use IPv6 addresses only. + + -A Enables forwarding of connections from an authentication agent + such as ssh-agent(1). This can also be specified on a per-host + basis in a configuration file. + + Agent forwarding should be enabled with caution. Users with the + ability to bypass file permissions on the remote host (for the + agent's Unix-domain socket) can access the local agent through + the forwarded connection. An attacker cannot obtain key material + from the agent, however they can perform operations on the keys + that enable them to authenticate using the identities loaded into + the agent. A safer alternative may be to use a jump host (see + -J). + + -a Disables forwarding of the authentication agent connection. + + -B bind_interface + Bind to the address of bind_interface before attempting to + connect to the destination host. This is only useful on systems + with more than one address. + + -b bind_address + Use bind_address on the local machine as the source address of + the connection. Only useful on systems with more than one + address. + + -C Requests compression of all data (including stdin, stdout, + stderr, and data for forwarded X11, TCP and Unix-domain + connections). The compression algorithm is the same used by + gzip(1). Compression is desirable on modem lines and other slow + connections, but will only slow down things on fast networks. + The default value can be set on a host-by-host basis in the + configuration files; see the Compression option in ssh_config(5). + + -c cipher_spec + Selects the cipher specification for encrypting the session. + cipher_spec is a comma-separated list of ciphers listed in order + of preference. See the Ciphers keyword in ssh_config(5) for more + information. + + -D [bind_address:]port + Specifies a local M-bM-^@M-^\dynamicM-bM-^@M-^] application-level port forwarding. + This works by allocating a socket to listen to port on the local + side, optionally bound to the specified bind_address. Whenever a + connection is made to this port, the connection is forwarded over + the secure channel, and the application protocol is then used to + determine where to connect to from the remote machine. Currently + the SOCKS4 and SOCKS5 protocols are supported, and ssh will act + as a SOCKS server. Only root can forward privileged ports. + Dynamic port forwardings can also be specified in the + configuration file. + + IPv6 addresses can be specified by enclosing the address in + square brackets. Only the superuser can forward privileged + ports. By default, the local port is bound in accordance with + the GatewayPorts setting. However, an explicit bind_address may + be used to bind the connection to a specific address. The + bind_address of M-bM-^@M-^\localhostM-bM-^@M-^] indicates that the listening port be + bound for local use only, while an empty address or M-bM-^@M-^X*M-bM-^@M-^Y indicates + that the port should be available from all interfaces. + + -E log_file + Append debug logs to log_file instead of standard error. + + -e escape_char + Sets the escape character for sessions with a pty (default: M-bM-^@M-^X~M-bM-^@M-^Y). + The escape character is only recognized at the beginning of a + line. The escape character followed by a dot (M-bM-^@M-^X.M-bM-^@M-^Y) closes the + connection; followed by control-Z suspends the connection; and + followed by itself sends the escape character once. Setting the + character to M-bM-^@M-^\noneM-bM-^@M-^] disables any escapes and makes the session + fully transparent. + + -F configfile + Specifies an alternative per-user configuration file. If a + configuration file is given on the command line, the system-wide + configuration file (/etc/ssh/ssh_config) will be ignored. The + default for the per-user configuration file is ~/.ssh/config. If + set to M-bM-^@M-^\noneM-bM-^@M-^], no configuration files will be read. + + -f Requests ssh to go to background just before command execution. + This is useful if ssh is going to ask for passwords or + passphrases, but the user wants it in the background. This + implies -n. The recommended way to start X11 programs at a + remote site is with something like ssh -f host xterm. + + If the ExitOnForwardFailure configuration option is set to M-bM-^@M-^\yesM-bM-^@M-^], + then a client started with -f will wait for all remote port + forwards to be successfully established before placing itself in + the background. Refer to the description of + ForkAfterAuthentication in ssh_config(5) for details. + + -G Causes ssh to print its configuration after evaluating Host and + Match blocks and exit. + + -g Allows remote hosts to connect to local forwarded ports. If used + on a multiplexed connection, then this option must be specified + on the master process. + + -I pkcs11 + Specify the PKCS#11 shared library ssh should use to communicate + with a PKCS#11 token providing keys for user authentication. + + -i identity_file + Selects a file from which the identity (private key) for public + key authentication is read. You can also specify a public key + file to use the corresponding private key that is loaded in + ssh-agent(1) when the private key file is not present locally. + The default is ~/.ssh/id_rsa, ~/.ssh/id_ecdsa, + ~/.ssh/id_ecdsa_sk, ~/.ssh/id_ed25519, ~/.ssh/id_ed25519_sk and + ~/.ssh/id_mldsa44_ed25519. Identity files may also be specified + on a per-host basis in the configuration file. It is possible to + have multiple -i options (and multiple identities specified in + configuration files). If no certificates have been explicitly + specified by the CertificateFile directive, ssh will also try to + load certificate information from the filename obtained by + appending -cert.pub to identity filenames. + + -J destination + Connect to the target host by first making an ssh connection to + the jump host described by destination and then establishing a + TCP forwarding to the ultimate destination from there. Multiple + jump hops may be specified separated by comma characters. IPv6 + addresses can be specified by enclosing the address in square + brackets. This is a shortcut to specify a ProxyJump + configuration directive. Note that configuration directives + supplied on the command-line generally apply to the destination + host and not any specified jump hosts. Use ~/.ssh/config to + specify configuration for jump hosts. + + -K Enables GSSAPI-based authentication and forwarding (delegation) + of GSSAPI credentials to the server. + + -k Disables forwarding (delegation) of GSSAPI credentials to the + server. + + -L [bind_address:]port:host:hostport + -L [bind_address:]port:remote_socket + -L local_socket:host:hostport + -L local_socket:remote_socket + Specifies that connections to the given TCP port or Unix socket + on the local (client) host are to be forwarded to the given host + and port, or Unix socket, on the remote side. This works by + allocating a socket to listen to either a TCP port on the local + side, optionally bound to the specified bind_address, or to a + Unix socket. Whenever a connection is made to the local port or + socket, the connection is forwarded over the secure channel, and + a connection is made to either host port hostport, or the Unix + socket remote_socket, from the remote machine. + + Port forwardings can also be specified in the configuration file. + Only the superuser can forward privileged ports. IPv6 addresses + can be specified by enclosing the address in square brackets. + + By default, the local port is bound in accordance with the + GatewayPorts setting. However, an explicit bind_address may be + used to bind the connection to a specific address. The + bind_address of M-bM-^@M-^\localhostM-bM-^@M-^] indicates that the listening port be + bound for local use only, while an empty address or M-bM-^@M-^X*M-bM-^@M-^Y indicates + that the port should be available from all interfaces. + + -l login_name + Specifies the user to log in as on the remote machine. This also + may be specified on a per-host basis in the configuration file. + + -M Places the ssh client into M-bM-^@M-^\masterM-bM-^@M-^] mode for connection sharing. + Multiple -M options places ssh into M-bM-^@M-^\masterM-bM-^@M-^] mode but with + confirmation required using ssh-askpass(1) before each operation + that changes the multiplexing state (e.g. opening a new session). + Refer to the description of ControlMaster in ssh_config(5) for + details. + + -m mac_spec + A comma-separated list of MAC (message authentication code) + algorithms, specified in order of preference. See the MACs + keyword in ssh_config(5) for more information. + + -N Do not execute a remote command. This is useful for just + forwarding ports. Refer to the description of SessionType in + ssh_config(5) for details. + + -n Redirects stdin from /dev/null (actually, prevents reading from + stdin). This must be used when ssh is run in the background. A + common trick is to use this to run X11 programs on a remote + machine. For example, ssh -n shadows.cs.hut.fi emacs & will + start an emacs on shadows.cs.hut.fi, and the X11 connection will + be automatically forwarded over an encrypted channel. The ssh + program will be put in the background. (This does not work if + ssh needs to ask for a password or passphrase; see also the -f + option.) Refer to the description of StdinNull in ssh_config(5) + for details. + + -O ctl_cmd + Control an active connection multiplexing master process. When + the -O option is specified, the ctl_cmd argument is interpreted + and passed to the master process. Valid commands are: M-bM-^@M-^\checkM-bM-^@M-^] + (check that the master process is running), M-bM-^@M-^\conninfoM-bM-^@M-^] (report + information about the master connection), M-bM-^@M-^\channelsM-bM-^@M-^] (report + information about open channels), M-bM-^@M-^\forwardM-bM-^@M-^] (request forwardings + without command execution), M-bM-^@M-^\cancelM-bM-^@M-^] (cancel forwardings), + M-bM-^@M-^\proxyM-bM-^@M-^] (connect to a running multiplexing master in proxy mode), + M-bM-^@M-^\exitM-bM-^@M-^] (request the master to exit), and M-bM-^@M-^\stopM-bM-^@M-^] (request the + master to stop accepting further multiplexing requests). + + -o option + Can be used to give options in the format used in the + configuration file. This is useful for specifying options for + which there is no separate command-line flag. For full details + of the options, and their values, see ssh_config(5). + + -P tag Specify a tag name that may be used to select configuration in + ssh_config(5). Refer to the Tag and Match keywords in + ssh_config(5) for more information. + + -p port + Port to connect to on the remote host. This can be specified on + a per-host basis in the configuration file. + + -Q query_option + Queries for the algorithms supported by one of the following + features: cipher (supported symmetric ciphers), cipher-auth + (supported symmetric ciphers that support authenticated + encryption), help (supported query terms for use with the -Q + flag), mac (supported message integrity codes), kex (key exchange + algorithms), key (key types), key-ca-sign (valid CA signature + algorithms for certificates), key-cert (certificate key types), + key-plain (non-certificate key types), key-sig (all key types and + signature algorithms), protocol-version (supported SSH protocol + versions), and sig (supported signature algorithms). + Alternatively, any keyword from ssh_config(5) or sshd_config(5) + that takes an algorithm list may be used as an alias for the + corresponding query_option. + + -q Quiet mode. Causes most warning and diagnostic messages to be + suppressed. + + -R [bind_address:]port:host:hostport + -R [bind_address:]port:local_socket + -R remote_socket:host:hostport + -R remote_socket:local_socket + -R [bind_address:]port + Specifies that connections to the given TCP port or Unix socket + on the remote (server) host are to be forwarded to the local + side. + + This works by allocating a socket to listen to either a TCP port + or to a Unix socket on the remote side. Whenever a connection is + made to this port or Unix socket, the connection is forwarded + over the secure channel, and a connection is made from the local + machine to either an explicit destination specified by host port + hostport, or local_socket, or, if no explicit destination was + specified, ssh will act as a SOCKS 4/5 proxy and forward + connections to the destinations requested by the remote SOCKS + client. + + Port forwardings can also be specified in the configuration file. + Privileged ports can be forwarded only when logging in as root on + the remote machine. IPv6 addresses can be specified by enclosing + the address in square brackets. + + By default, TCP listening sockets on the server will be bound to + the loopback interface only. This may be overridden by + specifying a bind_address. An empty bind_address, or the address + M-bM-^@M-^X*M-bM-^@M-^Y, indicates that the remote socket should listen on all + interfaces. Specifying a remote bind_address will only succeed + if the server's GatewayPorts option is enabled (see + sshd_config(5)). + + If the port argument is M-bM-^@M-^X0M-bM-^@M-^Y, the listen port will be dynamically + allocated on the server and reported to the client at run time. + When used together with -O forward, the allocated port will be + printed to the standard output. + + -S ctl_path + Specifies the location of a control socket for connection + sharing, or the string M-bM-^@M-^\noneM-bM-^@M-^] to disable connection sharing. + Refer to the description of ControlPath and ControlMaster in + ssh_config(5) for details. + + -s May be used to request invocation of a subsystem on the remote + system. Subsystems facilitate the use of SSH as a secure + transport for other applications (e.g. sftp(1)). The subsystem + is specified as the remote command. Refer to the description of + SessionType in ssh_config(5) for details. + + -T Disable pseudo-terminal allocation. + + -t Force pseudo-terminal allocation. This can be used to execute + arbitrary screen-based programs on a remote machine, which can be + very useful, e.g. when implementing menu services. Multiple -t + options force tty allocation, even if ssh has no local tty. + + -V Display the version number and exit. + + -v Verbose mode. Causes ssh to print debugging messages about its + progress. This is helpful in debugging connection, + authentication, and configuration problems. Multiple -v options + increase the verbosity. The maximum is 3. + + -W host:port + Requests that standard input and output on the client be + forwarded to host on port over the secure channel. Implies -N, + -T, ExitOnForwardFailure and ClearAllForwardings, though these + can be overridden in the configuration file or using -o command + line options. + + -w local_tun[:remote_tun] + Requests tunnel device forwarding with the specified tun(4) + devices between the client (local_tun) and the server + (remote_tun). + + The devices may be specified by numerical ID or the keyword + M-bM-^@M-^\anyM-bM-^@M-^], which uses the next available tunnel device. If + remote_tun is not specified, it defaults to M-bM-^@M-^\anyM-bM-^@M-^]. See also the + Tunnel and TunnelDevice directives in ssh_config(5). + + If the Tunnel directive is unset, it will be set to the default + tunnel mode, which is M-bM-^@M-^\point-to-pointM-bM-^@M-^]. If a different Tunnel + forwarding mode it desired, then it should be specified before + -w. + + -X Enables X11 forwarding. This can also be specified on a per-host + basis in a configuration file. + + X11 forwarding should be enabled with caution. Users with the + ability to bypass file permissions on the remote host (for the + user's X authorization database) can access the local X11 display + through the forwarded connection. An attacker may then be able + to perform activities such as keystroke monitoring. + + For this reason, X11 forwarding is subjected to X11 SECURITY + extension restrictions by default. Refer to the ssh -Y option + and the ForwardX11Trusted directive in ssh_config(5) for more + information. + + -x Disables X11 forwarding. + + -Y Enables trusted X11 forwarding. Trusted X11 forwardings are not + subjected to the X11 SECURITY extension controls. + + -y Send log information using the syslog(3) system module. By + default this information is sent to stderr. + + -Z List the public keys that would be attempted for authentication + to the specified destination in preferred order and exit. + + ssh may additionally obtain configuration data from a per-user + configuration file and a system-wide configuration file. The file format + and configuration options are described in ssh_config(5). + +AUTHENTICATION + The OpenSSH SSH client supports SSH protocol 2. + + The methods available for authentication are: GSSAPI-based + authentication, host-based authentication, public key authentication, + keyboard-interactive authentication, and password authentication. + Authentication methods are tried in the order specified above, though + PreferredAuthentications can be used to change the default order. + + Host-based authentication works as follows: If the machine the user logs + in from is listed in /etc/hosts.equiv or /etc/shosts.equiv on the remote + machine, the user is non-root and the user names are the same on both + sides, or if the files ~/.rhosts or ~/.shosts exist in the user's home + directory on the remote machine and contain a line containing the name of + the client machine and the name of the user on that machine, the user is + considered for login. Additionally, the server must be able to verify + the client's host key (see the description of /etc/ssh/ssh_known_hosts + and ~/.ssh/known_hosts, below) for login to be permitted. This + authentication method closes security holes due to IP spoofing, DNS + spoofing, and routing spoofing. [Note to the administrator: + /etc/hosts.equiv, ~/.rhosts, and the rlogin/rsh protocol in general, are + inherently insecure and should be disabled if security is desired.] + + Public key authentication works as follows: The scheme is based on + public-key cryptography, using cryptosystems where encryption and + decryption are done using separate keys, and it is unfeasible to derive + the decryption key from the encryption key. The idea is that each user + creates a public/private key pair for authentication purposes. The + server knows the public key, and only the user knows the private key. + ssh implements public key authentication protocol automatically, using + one of the ECDSA, Ed25519 or RSA algorithms. + + The file ~/.ssh/authorized_keys lists the public keys that are permitted + for logging in. When the user logs in, the ssh program tells the server + which key pair it would like to use for authentication. The client + proves that it has access to the private key and the server checks that + the corresponding public key is authorized to accept the account. + + The server may inform the client of errors that prevented public key + authentication from succeeding after authentication completes using a + different method. These may be viewed by increasing the LogLevel to + DEBUG or higher (e.g. by using the -v flag). + + The user creates their key pair by running ssh-keygen(1). This stores + the private key in ~/.ssh/id_ecdsa (ECDSA), ~/.ssh/id_ecdsa_sk + (authenticator-hosted ECDSA), ~/.ssh/id_ed25519 (Ed25519), + ~/.ssh/id_ed25519_sk (authenticator-hosted Ed25519), + ~/.ssh/id_mldsa44_ed25519 (MLDSA44-ED25519), or ~/.ssh/id_rsa (RSA) and + stores the public key in ~/.ssh/id_ecdsa.pub (ECDSA), + ~/.ssh/id_ecdsa_sk.pub (authenticator-hosted ECDSA), + ~/.ssh/id_ed25519.pub (Ed25519), ~/.ssh/id_ed25519_sk.pub (authenticator- + hosted Ed25519), ~/.ssh/id_mldsa44_ed25519.pub (MLDSA44-ED25519), or + ~/.ssh/id_rsa.pub (RSA) in the user's home directory. The user should + then copy the public key to ~/.ssh/authorized_keys in their home + directory on the remote machine. The authorized_keys file corresponds to + the conventional ~/.rhosts file, and has one key per line, though the + lines can be very long. After this, the user can log in without giving + the password. + + A variation on public key authentication is available in the form of + certificate authentication: instead of a set of public/private keys, + signed certificates are used. This has the advantage that a single + trusted certification authority can be used in place of many + public/private keys. See the CERTIFICATES section of ssh-keygen(1) for + more information. + + The most convenient way to use public key or certificate authentication + may be with an authentication agent. See ssh-agent(1) and (optionally) + the AddKeysToAgent directive in ssh_config(5) for more information. + + Keyboard-interactive authentication works as follows: The server sends an + arbitrary "challenge" text and prompts for a response, possibly multiple + times. Examples of keyboard-interactive authentication include BSD + Authentication (see login.conf(5)) and PAM (some non-OpenBSD systems). + + Finally, if other authentication methods fail, ssh prompts the user for a + password. The password is sent to the remote host for checking; however, + since all communications are encrypted, the password cannot be seen by + someone listening on the network. + + ssh automatically maintains and checks a database containing + identification for all hosts it has ever been used with. Host keys are + stored in ~/.ssh/known_hosts in the user's home directory. Additionally, + the file /etc/ssh/ssh_known_hosts is automatically checked for known + hosts. Any new hosts are automatically added to the user's file. If a + host's identification ever changes, ssh warns about this and disables + password authentication to prevent server spoofing or man-in-the-middle + attacks, which could otherwise be used to circumvent the encryption. The + StrictHostKeyChecking option can be used to control logins to machines + whose host key is not known or has changed. + + When the user's identity has been accepted by the server, the server + either executes the given command in a non-interactive session or, if no + command has been specified, logs into the machine and gives the user a + normal shell as an interactive session. All communication with the + remote command or shell will be automatically encrypted. + + If an interactive session is requested, ssh by default will only request + a pseudo-terminal (pty) for interactive sessions when the client has one. + The flags -T and -t can be used to override this behaviour. + + If a pseudo-terminal has been allocated, the user may use the escape + characters noted below. + + If no pseudo-terminal has been allocated, the session is transparent and + can be used to reliably transfer binary data. On most systems, setting + the escape character to M-bM-^@M-^\noneM-bM-^@M-^] will also make the session transparent + even if a tty is used. + + The session terminates when the command or shell on the remote machine + exits and all X11 and TCP connections have been closed. + +ESCAPE CHARACTERS + When a pseudo-terminal has been requested, ssh supports a number of + functions through the use of an escape character. + + A single tilde character can be sent as ~~ or by following the tilde by a + character other than those described below. The escape character must + always follow a newline to be interpreted as special. The escape + character can be changed in configuration files using the EscapeChar + configuration directive or on the command line by the -e option. + + The supported escapes (assuming the default M-bM-^@M-^X~M-bM-^@M-^Y) are: + + ~. Disconnect. + + ~^Z Background ssh. + + ~# List forwarded connections. + + ~& Background ssh at logout when waiting for forwarded connection / + X11 sessions to terminate. + + ~? Display a list of escape characters. + + ~B Send a BREAK to the remote system (only useful if the peer + supports it). + + ~C Open command line. Currently this allows the addition of port + forwardings using the -L, -R and -D options (see above). It also + allows the cancellation of existing port-forwardings with + -KL[bind_address:]port for local, -KR[bind_address:]port for + remote and -KD[bind_address:]port for dynamic port-forwardings. + !command allows the user to execute a local command if the + PermitLocalCommand option is enabled in ssh_config(5). Basic + help is available, using the -h option. + + ~I Show information about the current SSH connection. + + ~R Request rekeying of the connection (only useful if the peer + supports it). + + ~V Decrease the verbosity (LogLevel) when errors are being written + to stderr. + + ~v Increase the verbosity (LogLevel) when errors are being written + to stderr. + +TCP FORWARDING + Forwarding of arbitrary TCP connections over a secure channel can be + specified either on the command line or in a configuration file. One + possible application of TCP forwarding is a secure connection to a mail + server; another is going through firewalls. + + In the example below, we look at encrypting communication for an IRC + client, even though the IRC server it connects to does not directly + support encrypted communication. This works as follows: the user + connects to the remote host using ssh, specifying the ports to be used to + forward the connection. After that it is possible to start the program + locally, and ssh will encrypt and forward the connection to the remote + server. + + The following example tunnels an IRC session from the client to an IRC + server at M-bM-^@M-^\server.example.comM-bM-^@M-^], joining channel M-bM-^@M-^\#usersM-bM-^@M-^], nickname + M-bM-^@M-^\pinkyM-bM-^@M-^], using the standard IRC port, 6667: + + $ ssh -f -L 6667:localhost:6667 server.example.com sleep 10 + $ irc -c '#users' pinky IRC/127.0.0.1 + + The -f option backgrounds ssh and the remote command M-bM-^@M-^\sleep 10M-bM-^@M-^] is + specified to allow an amount of time (10 seconds, in the example) to + start the program which is going to use the tunnel. If no connections + are made within the time specified, ssh will exit. + +X11 FORWARDING + If the ForwardX11 variable is set to M-bM-^@M-^\yesM-bM-^@M-^] (or see the description of the + -X, -x, and -Y options above) and the user is using X11 (the DISPLAY + environment variable is set), the connection to the X11 display is + automatically forwarded to the remote side in such a way that any X11 + programs started from the shell (or command) will go through the + encrypted channel, and the connection to the real X server will be made + from the local machine. The user should not manually set DISPLAY. + Forwarding of X11 connections can be configured on the command line or in + configuration files. + + The DISPLAY value set by ssh will point to the server machine, but with a + display number greater than zero. This is normal, and happens because + ssh creates a M-bM-^@M-^\proxyM-bM-^@M-^] X server on the server machine for forwarding the + connections over the encrypted channel. + + ssh will also automatically set up Xauthority data on the server machine. + For this purpose, it will generate a random authorization cookie, store + it in Xauthority on the server, and verify that any forwarded connections + carry this cookie and replace it by the real cookie when the connection + is opened. The real authentication cookie is never sent to the server + machine (and no cookies are sent in the plain). + + If the ForwardAgent variable is set to M-bM-^@M-^\yesM-bM-^@M-^] (or see the description of + the -A and -a options above) and the user is using an authentication + agent, the connection to the agent is automatically forwarded to the + remote side. + +VERIFYING HOST KEYS + When connecting to a server for the first time, a fingerprint of the + server's public key is presented to the user (unless the option + StrictHostKeyChecking has been disabled). Fingerprints can be determined + using ssh-keygen(1): + + $ ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key + + If the fingerprint is already known, it can be matched and the key can be + accepted or rejected. If only legacy (MD5) fingerprints for the server + are available, the ssh-keygen(1) -E option may be used to downgrade the + fingerprint algorithm to match. + + Because of the difficulty of comparing host keys just by looking at + fingerprint strings, there is also support to compare host keys visually, + using random art. By setting the VisualHostKey option to M-bM-^@M-^\yesM-bM-^@M-^], a small + ASCII graphic gets displayed on every login to a server, no matter if the + session itself is interactive or not. By learning the pattern a known + server produces, a user can easily find out that the host key has changed + when a completely different pattern is displayed. Because these patterns + are not unambiguous however, a pattern that looks similar to the pattern + remembered only gives a good probability that the host key is the same, + not guaranteed proof. + + To get a listing of the fingerprints along with their random art for all + known hosts, the following command line can be used: + + $ ssh-keygen -lv -f ~/.ssh/known_hosts + + If the fingerprint is unknown, an alternative method of verification is + available: SSH fingerprints verified by DNS. An additional resource + record (RR), SSHFP, is added to a zonefile and the connecting client is + able to match the fingerprint with that of the key presented. + + In this example, we are connecting a client to a server, + M-bM-^@M-^\host.example.comM-bM-^@M-^]. The SSHFP resource records should first be added to + the zonefile for host.example.com: + + $ ssh-keygen -r host.example.com. + + The output lines will have to be added to the zonefile. To check that + the zone is answering fingerprint queries: + + $ dig -t SSHFP host.example.com + + Finally the client connects: + + $ ssh -o "VerifyHostKeyDNS ask" host.example.com + [...] + Matching host key fingerprint found in DNS. + Are you sure you want to continue connecting (yes/no)? + + See the VerifyHostKeyDNS option in ssh_config(5) for more information. + +SSH-BASED VIRTUAL PRIVATE NETWORKS + ssh contains support for Virtual Private Network (VPN) tunnelling using + the tun(4) network pseudo-device, allowing two networks to be joined + securely. The sshd_config(5) configuration option PermitTunnel controls + whether the server supports this, and at what level (layer 2 or 3 + traffic). + + The following example would connect client network 10.0.50.0/24 with + remote network 10.0.99.0/24 using a point-to-point connection from + 10.1.1.1 to 10.1.1.2, provided that the SSH server running on the gateway + to the remote network, at 192.168.1.15, allows it. + + On the client: + + # ssh -f -w 0:1 192.168.1.15 true + # ifconfig tun0 10.1.1.1 10.1.1.2 netmask 255.255.255.252 + # route add 10.0.99.0/24 10.1.1.2 + + On the server: + + # ifconfig tun1 10.1.1.2 10.1.1.1 netmask 255.255.255.252 + # route add 10.0.50.0/24 10.1.1.1 + + Client access may be more finely tuned via the /root/.ssh/authorized_keys + file (see below) and the PermitRootLogin server option. The following + entry would permit connections on tun(4) device 1 from user M-bM-^@M-^\janeM-bM-^@M-^] and on + tun device 2 from user M-bM-^@M-^\johnM-bM-^@M-^], if PermitRootLogin is set to + M-bM-^@M-^\forced-commands-onlyM-bM-^@M-^]: + + tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... jane + tunnel="2",command="sh /etc/netstart tun2" ssh-rsa ... john + + Since an SSH-based setup entails a fair amount of overhead, it may be + more suited to temporary setups, such as for wireless VPNs. More + permanent VPNs are better provided by tools such as ipsecctl(8) and + isakmpd(8). + +ENVIRONMENT + ssh will normally set the following environment variables: + + DISPLAY The DISPLAY variable indicates the location of the + X11 server. It is automatically set by ssh to + point to a value of the form M-bM-^@M-^\hostname:nM-bM-^@M-^], where + M-bM-^@M-^\hostnameM-bM-^@M-^] indicates the host where the shell runs, + and M-bM-^@M-^XnM-bM-^@M-^Y is an integer M-bM-^IM-% 1. ssh uses this special + value to forward X11 connections over the secure + channel. The user should normally not set DISPLAY + explicitly, as that will render the X11 connection + insecure (and will require the user to manually + copy any required authorization cookies). + + HOME Set to the path of the user's home directory. + + LOGNAME Synonym for USER; set for compatibility with + systems that use this variable. + + MAIL Set to the path of the user's mailbox. + + PATH Set to the default PATH, as specified when + compiling ssh. + + SSH_ASKPASS If ssh needs a passphrase, it will read the + passphrase from the current terminal if it was run + from a terminal. If ssh does not have a terminal + associated with it but DISPLAY and SSH_ASKPASS are + set, it will execute the program specified by + SSH_ASKPASS and open an X11 window to read the + passphrase. This is particularly useful when + calling ssh from a .xsession or related script. + (Note that on some machines it may be necessary to + redirect the input from /dev/null to make this + work.) + + SSH_ASKPASS_REQUIRE Allows further control over the use of an askpass + program. If this variable is set to M-bM-^@M-^\neverM-bM-^@M-^] then + ssh will never attempt to use one. If it is set to + M-bM-^@M-^\preferM-bM-^@M-^], then ssh will prefer to use the askpass + program instead of the TTY when requesting + passwords. Finally, if the variable is set to + M-bM-^@M-^\forceM-bM-^@M-^], then the askpass program will be used for + all passphrase input regardless of whether DISPLAY + is set. + + SSH_AUTH_SOCK Identifies the path of a Unix-domain socket used to + communicate with the agent. + + SSH_CONNECTION Identifies the client and server ends of the + connection. The variable contains four space- + separated values: client IP address, client port + number, server IP address, and server port number. + + SSH_ORIGINAL_COMMAND This variable contains the original command line if + a forced command is executed. It can be used to + extract the original arguments. + + SSH_TTY This is set to the name of the tty (path to the + device) associated with the current shell or + command. If the current session has no tty, this + variable is not set. + + SSH_TUNNEL Optionally set by sshd(8) to contain the interface + names assigned if tunnel forwarding was requested + by the client. + + SSH_USER_AUTH Optionally set by sshd(8), this variable may + contain a pathname to a file that lists the + authentication methods successfully used when the + session was established, including any public keys + that were used. + + TZ This variable is set to indicate the present time + zone if it was set when the daemon was started + (i.e. the daemon passes the value on to new + connections). + + USER Set to the name of the user logging in. + + Additionally, ssh reads ~/.ssh/environment, and adds lines of the format + M-bM-^@M-^\VARNAME=valueM-bM-^@M-^] to the environment if the file exists and users are + allowed to change their environment. For more information, see the + PermitUserEnvironment option in sshd_config(5). + +FILES + ~/.rhosts + This file is used for host-based authentication (see above). On + some machines this file may need to be world-readable if the + user's home directory is on an NFS partition, because sshd(8) + reads it as root. Additionally, this file must be owned by the + user, and must not have write permissions for anyone else. The + recommended permission for most machines is read/write for the + user, and not accessible by others. + + ~/.shosts + This file is used in exactly the same way as .rhosts, but allows + host-based authentication without permitting login with + rlogin/rsh. + + ~/.ssh/ + This directory is the default location for all user-specific + configuration and authentication information. There is no + general requirement to keep the entire contents of this directory + secret, but the recommended permissions are read/write/execute + for the user, and not accessible by others. + + ~/.ssh/authorized_keys + Lists the public keys (ECDSA, Ed25519, RSA) that can be used for + logging in as this user. The format of this file is described in + the sshd(8) manual page. This file is not highly sensitive, but + the recommended permissions are read/write for the user, and not + accessible by others. + + ~/.ssh/config + This is the per-user configuration file. The file format and + configuration options are described in ssh_config(5). Because of + the potential for abuse, this file must have strict permissions: + read/write for the user, and not writable by others. + + ~/.ssh/environment + Contains additional definitions for environment variables; see + ENVIRONMENT, above. + + ~/.ssh/id_ecdsa + ~/.ssh/id_ecdsa_sk + ~/.ssh/id_ed25519 + ~/.ssh/id_ed25519_sk + ~/.ssh/id_mldsa44_ed25519 + ~/.ssh/id_rsa + Contains the private key for authentication. These files contain + sensitive data and should be readable by the user but not + accessible by others (read/write/execute). ssh will simply + ignore a private key file if it is accessible by others. It is + possible to specify a passphrase when generating the key which + will be used to encrypt the sensitive part of this file using + AES-128. + + ~/.ssh/id_ecdsa.pub + ~/.ssh/id_ecdsa_sk.pub + ~/.ssh/id_ed25519.pub + ~/.ssh/id_ed25519_sk.pub + ~/.ssh/id_mldsa44_ed25519.pub + ~/.ssh/id_rsa.pub + Contains the public key for authentication. These files are not + sensitive and can (but need not) be readable by anyone. + + ~/.ssh/known_hosts + Contains a list of host keys for all hosts the user has logged + into that are not already in the systemwide list of known host + keys. See sshd(8) for further details of the format of this + file. + + ~/.ssh/rc + Commands in this file are executed by ssh when the user logs in, + just before the user's shell (or command) is started. See the + sshd(8) manual page for more information. + + /etc/hosts.equiv + This file is for host-based authentication (see above). It + should only be writable by root. + + /etc/shosts.equiv + This file is used in exactly the same way as hosts.equiv, but + allows host-based authentication without permitting login with + rlogin/rsh. + + /etc/ssh/ssh_config + Systemwide configuration file. The file format and configuration + options are described in ssh_config(5). + + /etc/ssh/ssh_host_ecdsa_key + /etc/ssh/ssh_host_ed25519_key + /etc/ssh/ssh_host_mldsa44_ed25519_key + /etc/ssh/ssh_host_rsa_key + These files contain the private parts of the host keys and are + used for host-based authentication. + + /etc/ssh/ssh_known_hosts + Systemwide list of known host keys. This file should be prepared + by the system administrator to contain the public host keys of + all machines in the organization. It should be world-readable. + See sshd(8) for further details of the format of this file. + + /etc/ssh/sshrc + Commands in this file are executed by ssh when the user logs in, + just before the user's shell (or command) is started. See the + sshd(8) manual page for more information. + +EXIT STATUS + ssh exits with the exit status of the remote command or with 255 if an + error occurred. + +SEE ALSO + scp(1), sftp(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), ssh-keyscan(1), + tun(4), ssh_config(5), ssh-keysign(8), sshd(8) + +STANDARDS + S. Lehtinen and C. Lonvick, The Secure Shell (SSH) Protocol Assigned + Numbers, RFC 4250, January 2006. + + T. Ylonen and C. Lonvick, The Secure Shell (SSH) Protocol Architecture, + RFC 4251, January 2006. + + T. Ylonen and C. Lonvick, The Secure Shell (SSH) Authentication Protocol, + RFC 4252, January 2006. + + T. Ylonen and C. Lonvick, The Secure Shell (SSH) Transport Layer + Protocol, RFC 4253, January 2006. + + T. Ylonen and C. Lonvick, The Secure Shell (SSH) Connection Protocol, RFC + 4254, January 2006. + + J. Schlyter and W. Griffin, Using DNS to Securely Publish Secure Shell + (SSH) Key Fingerprints, RFC 4255, January 2006. + + F. Cusack and M. Forssen, Generic Message Exchange Authentication for the + Secure Shell Protocol (SSH), RFC 4256, January 2006. + + J. Galbraith and P. Remaker, The Secure Shell (SSH) Session Channel Break + Extension, RFC 4335, January 2006. + + M. Bellare, T. Kohno, and C. Namprempre, The Secure Shell (SSH) Transport + Layer Encryption Modes, RFC 4344, January 2006. + + B. Harris, Improved Arcfour Modes for the Secure Shell (SSH) Transport + Layer Protocol, RFC 4345, January 2006. + + M. Friedl, N. Provos, and W. Simpson, Diffie-Hellman Group Exchange for + the Secure Shell (SSH) Transport Layer Protocol, RFC 4419, March 2006. + + J. Galbraith and R. Thayer, The Secure Shell (SSH) Public Key File + Format, RFC 4716, November 2006. + + D. Stebila and J. Green, Elliptic Curve Algorithm Integration in the + Secure Shell Transport Layer, RFC 5656, December 2009. + + A. Perrig and D. Song, Hash Visualization: a New Technique to improve + Real-World Security, 1999, International Workshop on Cryptographic + Techniques and E-Commerce (CrypTEC '99). + +AUTHORS + OpenSSH is a derivative of the original and free ssh 1.2.12 release by + Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo + de Raadt and Dug Song removed many bugs, re-added newer features and + created OpenSSH. Markus Friedl contributed the support for SSH protocol + versions 1.5 and 2.0. + +OpenBSD 8.0 August 4, 2026 SSH(1) diff --git a/ssh.c b/ssh.c index cb10238440da..b4b3987beb49 100644 --- a/ssh.c +++ b/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.634 2026/07/06 07:49:58 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.637 2026/08/07 05:03:56 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -169,7 +169,7 @@ static void usage(void) { fprintf(stderr, -"usage: hpnssh [-46AaCfGgKkMNnqsTtVvXxYy] [-B bind_interface] [-b bind_address]\n" +"usage: hpnssh [-46AaCfGgKkMNnqsTtVvXxYyZ] [-B bind_interface] [-b bind_address]\n" " [-c cipher_spec] [-D [bind_address:]port] [-E log_file]\n" " [-e escape_char] [-F configfile] [-I pkcs11] [-i identity_file]\n" " [-J destination] [-L address] [-l login_name] [-m mac_spec]\n" @@ -622,7 +622,7 @@ main(int ac, char **av) { struct ssh *ssh = NULL; int i, r, opt, exit_status, use_syslog, direct, timeout_ms; - int was_addr, config_test = 0, opt_terminated = 0, want_final_pass = 0; + int was_addr, config_test = 0, dump_pubkeys = 0, opt_terminated = 0, want_final_pass = 0; int user_on_commandline = 0, user_was_default = 0, user_expanded = 0; char *p, *cp, *line, *argv0, *logfile, *args; char cname[NI_MAXHOST], thishost[NI_MAXHOST]; @@ -701,8 +701,9 @@ main(int ac, char **av) argv0 = av[0]; again: - while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" - "AB:CD:E:F:GI:J:KL:MNO:P:Q:R:S:TVw:W:XYy")) != -1) { /* HUZdhjruz */ + /* remaining: HUdhjruz */ + while ((opt = getopt(ac, av, "1246ACGKMNTVXYZafgknqstvxy" + "B:D:E:F:I:J:L:O:P:Q:R:S:W:b:c:e:i:l:m:o:p:w:")) != -1) { switch (opt) { case '1': fatal("SSH protocol v.1 is no longer supported"); @@ -742,6 +743,9 @@ main(int ac, char **av) options.forward_x11 = 1; options.forward_x11_trusted = 1; break; + case 'Z': + dump_pubkeys = 1; + break; case 'g': options.fwd_opts.gateway_ports = 1; break; @@ -1643,6 +1647,38 @@ main(int ac, char **av) } } + /* load options.identity_files */ + load_public_identity_files(cinfo); + + /* optionally set the SSH_AUTHSOCKET_ENV_NAME variable */ + if (options.identity_agent && + strcmp(options.identity_agent, SSH_AUTHSOCKET_ENV_NAME) != 0) { + if (strcmp(options.identity_agent, "none") == 0) { + unsetenv(SSH_AUTHSOCKET_ENV_NAME); + } else { + cp = options.identity_agent; + /* legacy (limited) format */ + if (cp[0] == '$' && cp[1] != '{') { + if (!valid_env_name(cp + 1)) { + fatal("Invalid IdentityAgent " + "environment variable name %s", cp); + } + if ((p = getenv(cp + 1)) == NULL) + unsetenv(SSH_AUTHSOCKET_ENV_NAME); + else + setenv(SSH_AUTHSOCKET_ENV_NAME, p, 1); + } else { + /* identity_agent specifies a path directly */ + setenv(SSH_AUTHSOCKET_ENV_NAME, cp, 1); + } + } + } + + if (dump_pubkeys) { + pubkey_dump(ssh); + exit(0); + } + /* * If hostname canonicalisation was not enabled, then we may not * have yet resolved the hostname. Do so now. @@ -1763,33 +1799,6 @@ main(int ac, char **av) } } - /* load options.identity_files */ - load_public_identity_files(cinfo); - - /* optionally set the SSH_AUTHSOCKET_ENV_NAME variable */ - if (options.identity_agent && - strcmp(options.identity_agent, SSH_AUTHSOCKET_ENV_NAME) != 0) { - if (strcmp(options.identity_agent, "none") == 0) { - unsetenv(SSH_AUTHSOCKET_ENV_NAME); - } else { - cp = options.identity_agent; - /* legacy (limited) format */ - if (cp[0] == '$' && cp[1] != '{') { - if (!valid_env_name(cp + 1)) { - fatal("Invalid IdentityAgent " - "environment variable name %s", cp); - } - if ((p = getenv(cp + 1)) == NULL) - unsetenv(SSH_AUTHSOCKET_ENV_NAME); - else - setenv(SSH_AUTHSOCKET_ENV_NAME, p, 1); - } else { - /* identity_agent specifies a path directly */ - setenv(SSH_AUTHSOCKET_ENV_NAME, cp, 1); - } - } - } - if (options.forward_agent && options.forward_agent_sock_path != NULL) { cp = options.forward_agent_sock_path; if (cp[0] == '$') { @@ -1948,14 +1957,24 @@ forwarding_success(struct ssh *ssh) } } +struct rfwd_confirm_ctx { + int fid; +}; + /* Callback for remote forward global requests */ static void ssh_confirm_remote_forward(struct ssh *ssh, int type, uint32_t seq, void *ctxt) { - struct Forward *rfwd = (struct Forward *)ctxt; + struct rfwd_confirm_ctx *rctx = (struct rfwd_confirm_ctx *)ctxt; + struct Forward *rfwd; u_int port; int r; + if (rctx->fid < 0 || rctx->fid >= options.num_remote_forwards) + fatal_f("invalid forwarding ID %d", rctx->fid); + rfwd = &options.remote_forwards[rctx->fid]; + freezero(rctx, sizeof(*rctx)); + /* XXX verbose() on failure? */ debug("remote forward %s for: listen %s%s%d, connect %s:%d", type == SSH2_MSG_REQUEST_SUCCESS ? "success" : "failure", @@ -2133,6 +2152,8 @@ ssh_init_forwarding(struct ssh *ssh, char **ifname) /* Initiate remote TCP/IP port forwardings. */ for (i = 0; i < options.num_remote_forwards; i++) { + struct rfwd_confirm_ctx *rctx; + debug("Remote connections from %.200s:%d forwarded to " "local address %.200s:%d", (options.remote_forwards[i].listen_path != NULL) ? @@ -2147,9 +2168,10 @@ ssh_init_forwarding(struct ssh *ssh, char **ifname) if ((options.remote_forwards[i].handle = channel_request_remote_forwarding(ssh, &options.remote_forwards[i])) >= 0) { + rctx = xcalloc(1, sizeof(*rctx)); + rctx->fid = i; client_register_global_confirm( - ssh_confirm_remote_forward, - &options.remote_forwards[i]); + ssh_confirm_remote_forward, rctx); forward_confirms_pending++; } else if (options.exit_on_forward_failure) fatal("Could not request remote forwarding."); diff --git a/ssh_api.c b/ssh_api.c index abca2bf46c2d..748df8c842f7 100644 --- a/ssh_api.c +++ b/ssh_api.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh_api.c,v 1.34 2026/03/03 09:57:25 dtucker Exp $ */ +/* $OpenBSD: ssh_api.c,v 1.35 2026/07/27 12:28:52 markus Exp $ */ /* * Copyright (c) 2012 Markus Friedl. All rights reserved. * @@ -128,13 +128,12 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server; ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -# ifdef OPENSSL_HAS_ECC ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_server; -# endif #endif /* WITH_OPENSSL */ ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_server; ssh->kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_server; ssh->kex->kex[KEX_KEM_MLKEM768X25519_SHA256] = kex_gen_server; + ssh->kex->kex[KEX_KEM_MLKEM768ECDH_SHA256] = kex_gen_server; ssh->kex->load_host_public_key=&_ssh_host_public_key; ssh->kex->load_host_private_key=&_ssh_host_private_key; ssh->kex->sign=&_ssh_host_key_sign; @@ -147,13 +146,12 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_client; ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; -# ifdef OPENSSL_HAS_ECC ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client; -# endif #endif /* WITH_OPENSSL */ ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_client; ssh->kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_client; ssh->kex->kex[KEX_KEM_MLKEM768X25519_SHA256] = kex_gen_client; + ssh->kex->kex[KEX_KEM_MLKEM768ECDH_SHA256] = kex_gen_client; ssh->kex->verify_host_key =&_ssh_verify_host_key; } *sshp = ssh; diff --git a/ssh_config.0 b/ssh_config.0 new file mode 100644 index 000000000000..6cfaa2cebcff --- /dev/null +++ b/ssh_config.0 @@ -0,0 +1,1520 @@ +SSH_CONFIG(5) File Formats Manual SSH_CONFIG(5) + +NAME + ssh_config M-bM-^@M-^S OpenSSH client configuration file + +DESCRIPTION + ssh(1) obtains configuration data from the following sources in the + following order: + + 1. command-line options + 2. user's configuration file (~/.ssh/config) + 3. system-wide configuration file (/etc/ssh/ssh_config) + + Unless noted otherwise, for each configuration directive, the first + specified value will be used. + + The configuration files may contain sections separated by conditional + Host or Match directives. Configuration in these sections is only + applied if the conditional directive that started the section matches. + + Since the first obtained value for each directive is used, more host- + specific declarations should be given near the beginning of the file, and + general defaults at the end. + + The file contains directive/values pairs, one per line. Lines starting + with M-bM-^@M-^X#M-bM-^@M-^Y and empty lines are interpreted as comments. M-bM-^@M-^X#M-bM-^@M-^Y outside of a + quoted string may be used to add a comment to the end of a line. + Whitespace at the beginning or end of lines is ignored. Values may + optionally be enclosed in double quotes (") in order to represent + arguments containing spaces. + + Configuration directives are separated from their values by whitespace or + exactly one M-bM-^@M-^X=M-bM-^@M-^Y character (which may be surrounded by whitespace); the + latter format is useful to avoid the need to quote whitespace when + specifying configuration options using the ssh, scp, and sftp -o option. + + The possible keywords and their meanings are as follows (note that + keywords are case-insensitive and arguments are case-sensitive): + + Host Restricts the following declarations (up to the next Host or + Match keyword) to be only for those hosts that match one of the + patterns given after the keyword. If more than one pattern is + provided, they should be separated by whitespace. A single M-bM-^@M-^X*M-bM-^@M-^Y + as a pattern can be used to provide global defaults for all + hosts. The host is usually the hostname argument given on the + command line (see the CanonicalizeHostname keyword for + exceptions). + + A pattern entry may be negated by prefixing it with an + exclamation mark (M-bM-^@M-^X!M-bM-^@M-^Y). If a negated entry is matched, then the + Host entry is ignored, regardless of whether any other patterns + on the line match. Negated matches are therefore useful to + provide exceptions for wildcard matches. + + See PATTERNS for more information on patterns. + + Match Restricts the following declarations (up to the next Host or + Match keyword) to be used only when the conditions following the + Match keyword are satisfied. Match conditions are specified + using one or more criteria or the single token all which always + matches. The available criteria keywords are: canonical, final, + exec, localnetwork, host, originalhost, tagged, command, user, + localuser, and version. The all criteria must appear alone or + immediately after canonical or final. Other criteria may be + combined arbitrarily. All criteria but all, canonical, and final + require an argument. Criteria may be negated by prepending an + exclamation mark (M-bM-^@M-^X!M-bM-^@M-^Y). + + The canonical keyword matches only when the configuration file is + being re-parsed after hostname canonicalization (see the + CanonicalizeHostname option). This may be useful to specify + conditions that work with canonical host names only. + + The final keyword requests that the configuration be re-parsed + (regardless of whether CanonicalizeHostname is enabled), and + matches only during this final pass. If CanonicalizeHostname is + enabled, then canonical and final match during the same pass. + + The exec keyword executes the specified command under the user's + shell. If the command returns a zero exit status then the + condition is considered true. Commands containing whitespace + characters must be quoted. Arguments to exec accept the tokens + described in the TOKENS section. + + The localnetwork keyword matches the addresses of active local + network interfaces against the supplied list of networks in CIDR + format. This may be convenient for varying the effective + configuration on devices that roam between networks. Note that + network address is not a trustworthy criteria in many situations + (e.g. when the network is automatically configured using DHCP) + and so caution should be applied if using it to control security- + sensitive configuration. + + The other keywords' criteria must be single entries or comma- + separated lists and may use the wildcard and negation operators + described in the PATTERNS section. + + The criteria for the host keyword are matched against the target + hostname, after any substitution by the Hostname or + CanonicalizeHostname options. The originalhost keyword matches + against the hostname as it was specified on the command-line. + + The tagged keyword matches a tag name specified by a prior Tag + directive or on the ssh(1) command-line using the -P flag. The + command keyword matches the remote command that has been + requested, or the subsystem name that is being invoked (e.g. + "sftp" for an SFTP session). The empty string will match the + case where a command or tag has not been specified, i.e. M-bM-^@M-^XMatch + tag ""M-bM-^@M-^Y. The version keyword matches against the version string + of ssh(1), for example M-bM-^@M-^\OpenSSH_10.0M-bM-^@M-^]. + + The user keyword matches against the target username on the + remote host. The localuser keyword matches against the name of + the local user running ssh(1) (this keyword may be useful in + system-wide ssh_config files). + + Finally, the sessiontype keyword matches the requested session + type, which may be one of shell for interactive sessions, exec + for command execution sessions, subsystem for subsystem + invocations such as sftp(1), or none for transport-only sessions, + such as when ssh(1) is started with the -N flag. + + Include + Include the specified configuration file(s). Multiple pathnames + may be specified and each pathname may contain glob(7) wildcards, + tokens as described in the TOKENS section, environment variables + as described in the ENVIRONMENT VARIABLES section and, for user + configurations, shell-like M-bM-^@M-^X~M-bM-^@M-^Y references to user home + directories. Wildcards will be expanded and processed in lexical + order. Files without absolute paths are assumed to be in ~/.ssh + if included in a user configuration file or /etc/ssh if included + from the system configuration file. Include directive may appear + inside a Match or Host block to perform conditional inclusion. + + AddKeysToAgent + Specifies whether keys should be automatically added to a running + ssh-agent(1). If this option is set to yes and a key is loaded + from a file, the key and its passphrase are added to the agent + with the default lifetime, as if by ssh-add(1). If this option + is set to ask, ssh(1) will require confirmation using the + SSH_ASKPASS program before adding a key (see ssh-add(1) for + details). If this option is set to confirm, each use of the key + must be confirmed, as if the -c option was specified to + ssh-add(1). If this option is set to no, no keys are added to + the agent. Alternately, this option may be specified as a time + interval using the format described in the TIME FORMATS section + of sshd_config(5) to specify the key's lifetime in ssh-agent(1), + after which it will automatically be removed. The argument must + be no (the default), yes, confirm (optionally followed by a time + interval), ask or a time interval. + + AddressFamily + Specifies which address family to use when connecting. Valid + arguments are any (the default), inet (use IPv4 only), or inet6 + (use IPv6 only). + + BatchMode + If set to yes, user interaction such as password prompts and host + key confirmation requests will be disabled. This option is + useful in scripts and other batch jobs where no user is present + to interact with ssh(1). The argument must be yes or no (the + default). + + BindAddress + Use the specified address on the local machine as the source + address of the connection. Only useful on systems with more than + one address. + + BindInterface + Use the address of the specified interface on the local machine + as the source address of the connection. + + CanonicalDomains + When CanonicalizeHostname is enabled, this option specifies the + list of domain suffixes in which to search for the specified + destination host. + + CanonicalizeFallbackLocal + Specifies whether to fail with an error when hostname + canonicalization fails. The default, yes, will attempt to look + up the unqualified hostname using the system resolver's search + rules. A value of no will cause ssh(1) to fail instantly if + CanonicalizeHostname is enabled and the target hostname cannot be + found in any of the domains specified by CanonicalDomains. + + CanonicalizeHostname + Controls whether explicit hostname canonicalization is performed. + The default, no, is not to perform any name rewriting and let the + system resolver handle all hostname lookups. If set to yes then, + for connections that do not use a ProxyCommand or ProxyJump, + ssh(1) will attempt to canonicalize the hostname specified on the + command line using the CanonicalDomains suffixes and + CanonicalizePermittedCNAMEs rules. If CanonicalizeHostname is + set to always, then canonicalization is applied to proxied + connections too. + + If this option is enabled, then the configuration files are + processed again using the new target name to pick up any new + configuration in matching Host and Match stanzas. A value of + none disables the use of a ProxyJump host. + + CanonicalizeMaxDots + Specifies the maximum number of dot characters in a hostname + before canonicalization is disabled. The default, 1, allows a + single dot (i.e. hostname.subdomain). + + CanonicalizePermittedCNAMEs + Specifies rules to determine whether CNAMEs should be followed + when canonicalizing hostnames. The rules consist of one or more + arguments of source_domain_list:target_domain_list, where + source_domain_list is a pattern-list of domains that may follow + CNAMEs in canonicalization, and target_domain_list is a pattern- + list of domains that they may resolve to. + + For example, "*.a.example.com:*.b.example.com,*.c.example.com" + will allow hostnames matching "*.a.example.com" to be + canonicalized to names in the "*.b.example.com" or + "*.c.example.com" domains. + + A single argument of "none" causes no CNAMEs to be considered for + canonicalization. This is the default behaviour. + + CASignatureAlgorithms + Specifies which algorithms are allowed for signing of + certificates by certificate authorities (CAs). The default is: + + ssh-ed25519,ecdsa-sha2-nistp256, + ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, + sk-ssh-ed25519@openssh.com, + sk-ecdsa-sha2-nistp256@openssh.com, + rsa-sha2-512,rsa-sha2-256, + ssh-mldsa44-ed25519@openssh.com + + If the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the + specified algorithms will be appended to the default set instead + of replacing them. If the specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y + character, then the specified algorithms (including wildcards) + will be removed from the default set instead of replacing them. + + ssh(1) will not accept host certificates signed using algorithms + other than those specified. + + CertificateFile + Specifies a file from which the user's certificate is read. A + corresponding private key must be provided separately in order to + use this certificate either from an IdentityFile directive or -i + flag to ssh(1), via ssh-agent(1), or via a PKCS11Provider or + SecurityKeyProvider. + + Arguments to CertificateFile may use the tilde syntax to refer to + a user's home directory, the tokens described in the TOKENS + section and environment variables as described in the ENVIRONMENT + VARIABLES section. + + It is possible to have multiple certificate files specified in + configuration files; these certificates will be tried in + sequence. Multiple CertificateFile directives will add to the + list of certificates used for authentication. + + ChannelTimeout + Specifies whether and how quickly ssh(1) should close inactive + channels. Timeouts are specified as one or more M-bM-^@M-^\type=intervalM-bM-^@M-^] + pairs separated by whitespace, where the M-bM-^@M-^\typeM-bM-^@M-^] must be the + special keyword M-bM-^@M-^\globalM-bM-^@M-^] or a channel type name from the list + below, optionally containing wildcard characters. + + The timeout value M-bM-^@M-^\intervalM-bM-^@M-^] is specified in seconds or may use + any of the units documented in the TIME FORMATS section. For + example, M-bM-^@M-^\session=5mM-bM-^@M-^] would cause interactive sessions to + terminate after five minutes of inactivity. Specifying a zero + value disables the inactivity timeout. + + The special timeout M-bM-^@M-^\globalM-bM-^@M-^] applies to all active channels, + taken together. Traffic on any active channel will reset the + timeout, but when the timeout expires then all open channels will + be closed. Note that this global timeout is not matched by + wildcards and must be specified explicitly. + + The available channel type names include: + + agent-connection + Open connections to ssh-agent(1). + + direct-tcpip, direct-streamlocal@openssh.com + Open TCP or Unix socket (respectively) connections that + have been established from an ssh(1) local forwarding, + i.e. LocalForward or DynamicForward. + + forwarded-tcpip, forwarded-streamlocal@openssh.com + Open TCP or Unix socket (respectively) connections that + have been established to an sshd(8) listening on behalf + of an ssh(1) remote forwarding, i.e. RemoteForward. + + session + The interactive main session, including shell session, + command execution, scp(1), sftp(1), etc. + + tun-connection + Open TunnelForward connections. + + x11-connection + Open X11 forwarding sessions. + + Note that in all the above cases, terminating an inactive session + does not guarantee to remove all resources associated with the + session, e.g. shell processes or X11 clients relating to the + session may continue to execute. + + Moreover, terminating an inactive channel or session does not + necessarily close the SSH connection, nor does it prevent a + client from requesting another channel of the same type. In + particular, expiring an inactive forwarding session does not + prevent another identical forwarding from being subsequently + created. + + The default is not to expire channels of any type for inactivity. + + CheckHostIP + If set to yes, ssh(1) will additionally check the host IP address + in the known_hosts file. This allows it to detect if a host key + changed due to DNS spoofing and will add addresses of destination + hosts to ~/.ssh/known_hosts in the process, regardless of the + setting of StrictHostKeyChecking. If the option is set to no + (the default), the check will not be executed. + + Ciphers + Specifies the ciphers allowed and their order of preference. + Multiple ciphers must be comma-separated. If the specified list + begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the specified ciphers will be + appended to the default set instead of replacing them. If the + specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified + ciphers (including wildcards) will be removed from the default + set instead of replacing them. If the specified list begins with + a M-bM-^@M-^X^M-bM-^@M-^Y character, then the specified ciphers will be placed at the + head of the default set. + + The supported ciphers are: + + 3des-cbc + aes128-cbc + aes192-cbc + aes256-cbc + aes128-ctr + aes192-ctr + aes256-ctr + aes128-gcm@openssh.com + aes256-gcm@openssh.com + chacha20-poly1305@openssh.com + + The default is: + + chacha20-poly1305@openssh.com, + aes128-gcm@openssh.com,aes256-gcm@openssh.com, + aes128-ctr,aes192-ctr,aes256-ctr + + The list of available ciphers may also be obtained using "ssh -Q + cipher". + + ClearAllForwardings + Specifies that all local, remote, and dynamic port forwardings + specified in the configuration files or on the command line be + cleared. This option is primarily useful when used from the + ssh(1) command line to clear port forwardings set in + configuration files, and is automatically set by scp(1) and + sftp(1). The argument must be yes or no (the default). + + Compression + Specifies whether to use compression. The argument must be yes + or no (the default). + + Compression applies to all traffic that flows over the SSH + connection. If untrusted traffic (such as an open port-forward) + is permitted over the connection alongside trusted traffic, then + compression may leak information about session contents. For + this reason, it is not recommended to enable compression for + connections that share trusted and untrusted traffic. + + ConnectionAttempts + Specifies the number of tries (one per second) to make before + exiting. The argument must be an integer. This may be useful in + scripts if the connection sometimes fails. The default is 1. + + ConnectTimeout + Specifies the timeout (in seconds) used when connecting to the + SSH server, instead of using the default system TCP timeout. + This timeout is applied both to establishing the connection and + to performing the initial SSH protocol handshake and key + exchange. + + ControlMaster + Enables the sharing of multiple sessions over a single network + connection. When set to yes, ssh(1) will listen for connections + on a control socket specified using the ControlPath argument. + Additional sessions can connect to this socket using the same + ControlPath with ControlMaster set to no (the default). These + sessions will try to reuse the master instance's network + connection rather than initiating new ones, but will fall back to + connecting normally if the control socket does not exist, or is + not listening. + + Setting this to ask will cause ssh(1) to listen for control + connections, but require confirmation using ssh-askpass(1). If + the ControlPath cannot be opened, ssh(1) will continue without + connecting to a master instance. + + X11 and ssh-agent(1) forwarding is supported over these + multiplexed connections, however the display and agent forwarded + will be the one belonging to the master connection i.e. it is not + possible to forward multiple displays or agents. + + Two additional options allow for opportunistic multiplexing: try + to use a master connection but fall back to creating a new one if + one does not already exist. These options are: auto and autoask. + The latter requires confirmation like the ask option. + + ControlPath + Specify the path to the control socket used for connection + sharing as described in the ControlMaster section above or the + string none to disable connection sharing. Arguments to + ControlPath may use the tilde syntax to refer to a user's home + directory, the tokens described in the TOKENS section and + environment variables as described in the ENVIRONMENT VARIABLES + section. It is recommended that any ControlPath used for + opportunistic connection sharing include at least %h, %p, and %r + (or alternatively %C) and be placed in a directory that is not + writable by other users. This ensures that shared connections + are uniquely identified. + + ControlPersist + When used in conjunction with ControlMaster, specifies that the + master connection should remain open in the background (waiting + for future client connections) after the initial client + connection has been closed. If set to no (the default), then the + master connection will not be placed into the background, and + will close as soon as the initial client connection is closed. + If set to yes or 0, then the master connection will remain in the + background indefinitely (until killed or closed via a mechanism + such as the "ssh -O exit"). If set to a time in seconds, or a + time in any of the formats documented in sshd_config(5), then the + backgrounded master connection will automatically terminate after + it has remained idle (with no client connections) for the + specified time. + + DynamicForward + Specifies that a TCP port on the local machine be forwarded over + the secure channel, and the application protocol is then used to + determine where to connect to from the remote machine. + + The argument must be [bind_address:]port. IPv6 addresses can be + specified by enclosing addresses in square brackets. By default, + the local port is bound in accordance with the GatewayPorts + setting. However, an explicit bind_address may be used to bind + the connection to a specific address. The bind_address of + localhost indicates that the listening port be bound for local + use only, while an empty address or M-bM-^@M-^X*M-bM-^@M-^Y indicates that the port + should be available from all interfaces. + + Currently the SOCKS4 and SOCKS5 protocols are supported, and + ssh(1) will act as a SOCKS server. Multiple forwardings may be + specified, and additional forwardings can be given on the command + line. Only the superuser can forward privileged ports. + + EnableEscapeCommandline + Enables the command line option in the EscapeChar menu for + interactive sessions (default M-bM-^@M-^X~CM-bM-^@M-^Y). By default, the command + line is disabled. + + EnableSSHKeysign + Setting this option to yes in the global client configuration + file /etc/ssh/ssh_config enables the use of the helper program + ssh-keysign(8) during HostbasedAuthentication. The argument must + be yes or no (the default). This option should be placed in the + non-hostspecific section. See ssh-keysign(8) for more + information. + + EscapeChar + Sets the escape character (default: M-bM-^@M-^X~M-bM-^@M-^Y). The escape character + can also be set on the command line. The argument should be a + single character, M-bM-^@M-^X^M-bM-^@M-^Y followed by a letter, or none to disable + the escape character entirely (making the connection transparent + for binary data). + + ExitOnForwardFailure + Specifies whether ssh(1) should terminate the connection if it + cannot set up all requested dynamic, tunnel, local, and remote + port forwardings, (e.g. if either end is unable to bind and + listen on a specified port). Note that ExitOnForwardFailure does + not apply to connections made over port forwardings and will not, + for example, cause ssh(1) to exit if TCP connections to the + ultimate forwarding destination fail. The argument must be yes + or no (the default). + + FingerprintHash + Specifies the hash algorithm used when displaying key + fingerprints. Valid options are: md5 and sha256 (the default). + + ForkAfterAuthentication + Requests ssh to go to background just before command execution. + This is useful if ssh is going to ask for passwords or + passphrases, but the user wants it in the background. This + implies the StdinNull configuration option being set to M-bM-^@M-^\yesM-bM-^@M-^]. + The recommended way to start X11 programs at a remote site is + with something like ssh -f host xterm, which is the same as ssh + host xterm if the ForkAfterAuthentication configuration option is + set to M-bM-^@M-^\yesM-bM-^@M-^]. + + If the ExitOnForwardFailure configuration option is set to M-bM-^@M-^\yesM-bM-^@M-^], + then a client started with the ForkAfterAuthentication + configuration option being set to M-bM-^@M-^\yesM-bM-^@M-^] will wait for all remote + port forwards to be successfully established before placing + itself in the background. The argument to this keyword must be + yes (same as the -f option) or no (the default). + + ForwardAgent + Specifies whether the connection to the authentication agent (if + any) will be forwarded to the remote machine. The argument may + be yes, no (the default), an explicit path to an agent socket or + the name of an environment variable (beginning with M-bM-^@M-^X$M-bM-^@M-^Y) in which + to find the path. + + Agent forwarding should be enabled with caution. Users with the + ability to bypass file permissions on the remote host (for the + agent's Unix-domain socket) can access the local agent through + the forwarded connection. An attacker cannot obtain key material + from the agent, however they can perform operations on the keys + that enable them to authenticate using the identities loaded into + the agent. + + ForwardX11 + Specifies whether X11 connections will be automatically + redirected over the secure channel and DISPLAY set. The argument + must be yes or no (the default). + + X11 forwarding should be enabled with caution. Users with the + ability to bypass file permissions on the remote host (for the + user's X11 authorization database) can access the local X11 + display through the forwarded connection. An attacker may then + be able to perform activities such as keystroke monitoring if the + ForwardX11Trusted option is also enabled. + + ForwardX11Timeout + Specify a timeout for untrusted X11 forwarding using the format + described in the TIME FORMATS section of sshd_config(5). X11 + connections received by ssh(1) after this time will be refused. + Setting ForwardX11Timeout to zero will disable the timeout and + permit X11 forwarding for the life of the connection. The + default is to disable untrusted X11 forwarding after twenty + minutes has elapsed. + + ForwardX11Trusted + If this option is set to yes, remote X11 clients will have full + access to the original X11 display. + + If this option is set to no (the default), remote X11 clients + will be considered untrusted and prevented from stealing or + tampering with data belonging to trusted X11 clients. + Furthermore, the xauth(1) token used for the session will be set + to expire after 20 minutes. Remote clients will be refused + access after this time. + + See the X11 SECURITY extension specification for full details on + the restrictions imposed on untrusted clients. + + GatewayPorts + Specifies whether remote hosts are allowed to connect to local + forwarded ports. By default, ssh(1) binds local port forwardings + to the loopback address. This prevents other remote hosts from + connecting to forwarded ports. GatewayPorts can be used to + specify that ssh should bind local port forwardings to the + wildcard address, thus allowing remote hosts to connect to + forwarded ports. The argument must be yes or no (the default). + + GlobalKnownHostsFile + Specifies one or more files to use for the global host key + database, separated by whitespace. The default is + /etc/ssh/ssh_known_hosts, /etc/ssh/ssh_known_hosts2. + + GSSAPIAuthentication + Specifies whether user authentication based on GSSAPI is allowed. + The default is no. + + GSSAPIDelegateCredentials + Forward (delegate) credentials to the server. The default is no. + + HashKnownHosts + Indicates that ssh(1) should hash host names and addresses when + they are added to ~/.ssh/known_hosts. These hashed names may be + used normally by ssh(1) and sshd(8), but they do not visually + reveal identifying information if the file's contents are + disclosed. The default is no. Note that existing names and + addresses in known hosts files will not be converted + automatically, but may be manually hashed using ssh-keygen(1). + + HostbasedAcceptedAlgorithms + Specifies the signature algorithms that will be used for + hostbased authentication as a comma-separated list of patterns. + Alternately if the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, + then the specified signature algorithms will be appended to the + default set instead of replacing them. If the specified list + begins with a M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified signature + algorithms (including wildcards) will be removed from the default + set instead of replacing them. If the specified list begins with + a M-bM-^@M-^X^M-bM-^@M-^Y character, then the specified signature algorithms will be + placed at the head of the default set. The default for this + option is: + + ssh-ed25519-cert-v01@openssh.com, + ecdsa-sha2-nistp256-cert-v01@openssh.com, + ecdsa-sha2-nistp384-cert-v01@openssh.com, + ecdsa-sha2-nistp521-cert-v01@openssh.com, + sk-ssh-ed25519-cert-v01@openssh.com, + sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + rsa-sha2-512-cert-v01@openssh.com, + rsa-sha2-256-cert-v01@openssh.com, + ssh-mldsa44-ed25519-cert-v01@openssh.com, + ssh-ed25519, + ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, + sk-ssh-ed25519@openssh.com, + sk-ecdsa-sha2-nistp256@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256@openssh.com, + rsa-sha2-512,rsa-sha2-256, + ssh-mldsa44-ed25519@openssh.com + + The -Q option of ssh(1) may be used to list supported signature + algorithms. This was formerly named HostbasedKeyTypes. + + HostbasedAuthentication + Specifies whether to try rhosts based authentication with public + key authentication. The argument must be yes or no (the + default). + + HostKeyAlgorithms + Specifies the host key signature algorithms that the client wants + to use in order of preference. Alternately if the specified list + begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the specified signature + algorithms will be appended to the default set instead of + replacing them. If the specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y + character, then the specified signature algorithms (including + wildcards) will be removed from the default set instead of + replacing them. If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y + character, then the specified signature algorithms will be placed + at the head of the default set. The default for this option is: + + ssh-ed25519-cert-v01@openssh.com, + ecdsa-sha2-nistp256-cert-v01@openssh.com, + ecdsa-sha2-nistp384-cert-v01@openssh.com, + ecdsa-sha2-nistp521-cert-v01@openssh.com, + sk-ssh-ed25519-cert-v01@openssh.com, + sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + rsa-sha2-512-cert-v01@openssh.com, + rsa-sha2-256-cert-v01@openssh.com, + ssh-mldsa44-ed25519-cert-v01@openssh.com, + ssh-ed25519, + ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, + sk-ecdsa-sha2-nistp256@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256@openssh.com + sk-ssh-ed25519@openssh.com, + rsa-sha2-512,rsa-sha2-256, + ssh-mldsa44-ed25519@openssh.com + + If hostkeys are known for the destination host then this default + is modified to prefer their algorithms. + + The list of available signature algorithms may also be obtained + using "ssh -Q HostKeyAlgorithms". + + HostKeyAlias + Specifies an alias that should be used instead of the real host + name when looking up or saving the host key in the host key + database files and when validating host certificates. This + option is useful for tunneling SSH connections or for multiple + servers running on a single host. + + Hostname + Specifies the real host name to log into. This can be used to + specify nicknames or abbreviations for hosts. Arguments to + Hostname accept the tokens described in the TOKENS section. + Numeric IP addresses are also permitted (both on the command line + and in Hostname specifications). The default is the name given + on the command line. + + IdentitiesOnly + Specifies that ssh(1) should only use the configured + authentication identity and certificate files (either the default + files, or those explicitly configured in the ssh_config files or + passed on the ssh(1) command-line), even if ssh-agent(1) or a + PKCS11Provider or SecurityKeyProvider offers more identities. + The argument to this keyword must be yes or no (the default). + This option is intended for situations where ssh-agent offers + many different identities. + + IdentityAgent + Specifies the Unix-domain socket used to communicate with the + authentication agent. + + This option overrides the SSH_AUTH_SOCK environment variable and + can be used to select a specific agent. Setting the socket name + to none disables the use of an authentication agent. If the + string "SSH_AUTH_SOCK" is specified, the location of the socket + will be read from the SSH_AUTH_SOCK environment variable. + Otherwise if the specified value begins with a M-bM-^@M-^X$M-bM-^@M-^Y character, + then it will be treated as an environment variable containing the + location of the socket. + + Arguments to IdentityAgent may use the tilde syntax to refer to a + user's home directory, the tokens described in the TOKENS section + and environment variables as described in the ENVIRONMENT + VARIABLES section. + + IdentityFile + Specifies a file from which the user's ECDSA, authenticator- + hosted ECDSA, Ed25519, authenticator-hosted Ed25519 or RSA + authentication identity is read. You can also specify a public + key file to use the corresponding private key that is loaded in + ssh-agent(1) when the private key file is not present locally. + The default is ~/.ssh/id_rsa, ~/.ssh/id_ecdsa, + ~/.ssh/id_ecdsa_sk, ~/.ssh/id_ed25519, ~/.ssh/id_ed25519_sk and + ~/.ssh/id_mldsa44_ed25519. Additionally, any identities + represented by the authentication agent will be used for + authentication unless IdentitiesOnly is set. If no certificates + have been explicitly specified by CertificateFile, ssh(1) will + try to load certificate information from the filename obtained by + appending -cert.pub to the path of a specified IdentityFile. + + Arguments to IdentityFile may use the tilde syntax to refer to a + user's home directory or the tokens described in the TOKENS + section. Alternately an argument of none may be used to indicate + no identity files should be loaded. + + It is possible to have multiple identity files specified in + configuration files; all these identities will be tried in + sequence. Multiple IdentityFile directives will add to the list + of identities tried (this behaviour differs from that of other + configuration directives). + + IdentityFile may be used in conjunction with IdentitiesOnly to + select which identities in an agent are offered during + authentication. IdentityFile may also be used in conjunction + with CertificateFile in order to provide any certificate also + needed for authentication with the identity. + + IgnoreUnknown + Specifies a pattern-list of unknown options to be ignored if they + are encountered in configuration parsing. This may be used to + suppress errors if ssh_config contains options that are + unrecognised by ssh(1). It is recommended that IgnoreUnknown be + listed early in the configuration file as it will not be applied + to unknown options that appear before it. + + IPQoS Specifies the Differentiated Services Field Codepoint (DSCP) + value for connections. Accepted values are af11, af12, af13, + af21, af22, af23, af31, af32, af33, af41, af42, af43, cs0, cs1, + cs2, cs3, cs4, cs5, cs6, cs7, ef, le, a numeric value, or none to + use the operating system default. This option may take one or + two arguments, separated by whitespace. If one argument is + specified, it is used as the packet class unconditionally. If + two values are specified, the first is automatically selected for + interactive sessions and the second for non-interactive sessions. + The default is ef (Expedited Forwarding) for interactive sessions + and none (the operating system default) for non-interactive + sessions. + + KbdInteractiveAuthentication + Specifies whether to use keyboard-interactive authentication. + The argument to this keyword must be yes (the default) or no. + ChallengeResponseAuthentication is a deprecated alias for this. + + KbdInteractiveDevices + Specifies the list of methods to use in keyboard-interactive + authentication. Multiple method names must be comma-separated. + The default is to use the server specified list. The methods + available vary depending on what the server supports. For an + OpenSSH server, it may be zero or more of: bsdauth and pam. + + KexAlgorithms + Specifies the permitted KEX (Key Exchange) algorithms that will + be used and their preference order. The selected algorithm will + be the first algorithm in this list that the server also + supports. Multiple algorithms must be comma-separated. + + If the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the + specified algorithms will be appended to the default set instead + of replacing them. If the specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y + character, then the specified algorithms (including wildcards) + will be removed from the default set instead of replacing them. + If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the + specified algorithms will be placed at the head of the default + set. + + The default is: + + mlkem768x25519-sha256, + sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com, + curve25519-sha256,curve25519-sha256@libssh.org, + ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, + diffie-hellman-group-exchange-sha256, + diffie-hellman-group16-sha512, + diffie-hellman-group18-sha512, + diffie-hellman-group14-sha256 + + The list of supported key exchange algorithms may also be + obtained using "ssh -Q kex". + + KnownHostsCommand + Specifies a command to use to obtain a list of host keys, in + addition to those listed in UserKnownHostsFile and + GlobalKnownHostsFile. This command is executed after the files + have been read. It may write host key lines to standard output + in identical format to the usual files (described in the + VERIFYING HOST KEYS section in ssh(1)). Arguments to + KnownHostsCommand accept the tokens described in the TOKENS + section. The command may be invoked multiple times per + connection: once when preparing the preference list of host key + algorithms to use, again to obtain the host key for the requested + host name and, if CheckHostIP is enabled, one more time to obtain + the host key matching the server's address. If the command exits + abnormally or returns a non-zero exit status then the connection + is terminated. + + LocalCommand + Specifies a command to execute on the local machine after + successfully connecting to the server. The command string + extends to the end of the line, and is executed with the user's + shell. Arguments to LocalCommand accept the tokens described in + the TOKENS section. + + The command is run synchronously and does not have access to the + session of the ssh(1) that spawned it. It should not be used for + interactive commands. + + This directive is ignored unless PermitLocalCommand has been + enabled. + + LocalForward + Specifies that a TCP port or Unix-domain socket on the local + machine be forwarded over the secure channel to the specified + host and port (or Unix-domain socket) from the remote machine. + For a TCP port, the first argument must be [bind_address:]port or + a Unix domain socket path. The second argument is the + destination and may be host:hostport or a Unix domain socket path + if the remote host supports it. + + IPv6 addresses can be specified by enclosing addresses in square + brackets. + + If either argument contains a '/' in it, that argument will be + interpreted as a Unix-domain socket (on the corresponding host) + rather than a TCP port. + + Multiple forwardings may be specified, and additional forwardings + can be given on the command line. Only the superuser can forward + privileged ports. By default, the local port is bound in + accordance with the GatewayPorts setting. However, an explicit + bind_address may be used to bind the connection to a specific + address. The bind_address of localhost indicates that the + listening port be bound for local use only, while an empty + address or M-bM-^@M-^X*M-bM-^@M-^Y indicates that the port should be available from + all interfaces. Unix domain socket paths may use the tokens + described in the TOKENS section and environment variables as + described in the ENVIRONMENT VARIABLES section. + + LogLevel + Gives the verbosity level that is used when logging messages from + ssh(1). The possible values are: QUIET, FATAL, ERROR, INFO, + VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3. The default is INFO. + DEBUG and DEBUG1 are equivalent. DEBUG2 and DEBUG3 each specify + higher levels of verbose output. + + LogVerbose + Specify one or more overrides to LogLevel. An override consists + of one or more pattern lists that matches the source file, + function and line number to force detailed logging for. For + example, an override pattern of: + + kex.c:*:1000,*:kex_exchange_identification():*,packet.c:* + + would enable detailed logging for line 1000 of kex.c, everything + in the kex_exchange_identification() function, and all code in + the packet.c file. This option is intended for debugging and no + overrides are enabled by default. + + MACs Specifies the MAC (message authentication code) algorithms in + order of preference. The MAC algorithm is used for data + integrity protection. Multiple algorithms must be comma- + separated. If the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, + then the specified algorithms will be appended to the default set + instead of replacing them. If the specified list begins with a + M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified algorithms (including + wildcards) will be removed from the default set instead of + replacing them. If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y + character, then the specified algorithms will be placed at the + head of the default set. + + The algorithms that contain "-etm" calculate the MAC after + encryption (encrypt-then-mac). These are considered safer and + their use recommended. + + The default is: + + umac-64-etm@openssh.com,umac-128-etm@openssh.com, + hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com, + hmac-sha1-etm@openssh.com, + umac-64@openssh.com,umac-128@openssh.com, + hmac-sha2-256,hmac-sha2-512,hmac-sha1 + + The list of available MAC algorithms may also be obtained using + "ssh -Q mac". + + NoHostAuthenticationForLocalhost + Disable host authentication for localhost (loopback addresses). + The argument to this keyword must be yes or no (the default). + + NumberOfPasswordPrompts + Specifies the number of password prompts before giving up. The + argument to this keyword must be an integer. The default is 3. + + ObscureKeystrokeTiming + Specifies whether ssh(1) should try to obscure inter-keystroke + timings from passive observers of network traffic. If enabled, + then for interactive sessions, ssh(1) will send keystrokes at + fixed intervals of a few tens of milliseconds and will send fake + keystroke packets for some time after typing ceases. The + argument to this keyword must be yes, no or an interval specifier + of the form interval:milliseconds (e.g. interval:80 for 80 + milliseconds). The default is to obscure keystrokes using a 20ms + packet interval. Note that smaller intervals will result in + higher fake keystroke packet rates. + + PasswordAuthentication + Specifies whether to use password authentication. The argument + to this keyword must be yes (the default) or no. + + PermitLocalCommand + Allow local command execution via the LocalCommand option or + using the !command escape sequence in ssh(1). The argument must + be yes or no (the default). + + PermitRemoteOpen + Specifies the destinations to which remote TCP port forwarding is + permitted when RemoteForward is used as a SOCKS proxy. The + forwarding specification must be one of the following forms: + + PermitRemoteOpen host:port + PermitRemoteOpen IPv4_addr:port + PermitRemoteOpen [IPv6_addr]:port + + Multiple forwards may be specified by separating them with + whitespace. An argument of any can be used to remove all + restrictions and permit any forwarding requests. An argument of + none can be used to prohibit all forwarding requests. The + wildcard M-bM-^@M-^X*M-bM-^@M-^Y can be used for host or port to allow all hosts or + ports respectively. Otherwise, no pattern matching or address + lookups are performed on supplied names. + + PKCS11Provider + Specifies which PKCS#11 provider to use or none to indicate that + no provider should be used (the default). The argument to this + keyword is a path to the PKCS#11 shared library ssh(1) should use + to communicate with a PKCS#11 token providing keys for user + authentication. + + Port Specifies the port number to connect on the remote host. The + default is 22. + + PreferredAuthentications + Specifies the order in which the client should try authentication + methods. This allows a client to prefer one method (e.g. + keyboard-interactive) over another method (e.g. password). The + default is: + + gssapi-with-mic,hostbased,publickey, + keyboard-interactive,password + + ProxyCommand + Specifies the command to use to connect to the server. The + command string extends to the end of the line, and is executed + using the user's shell M-bM-^@M-^XexecM-bM-^@M-^Y directive to avoid a lingering + shell process. + + Arguments to ProxyCommand accept the tokens described in the + TOKENS section. The command can be basically anything, and + should read from its standard input and write to its standard + output. It should eventually connect an sshd(8) server running + on some machine, or execute sshd -i somewhere. Host key + management will be done using the Hostname of the host being + connected (defaulting to the name typed by the user). Setting + the command to none disables this option entirely. Note that + CheckHostIP is not available for connects with a proxy command. + + This directive is useful in conjunction with nc(1) and its proxy + support. For example, the following directive would connect via + an HTTP proxy at 192.0.2.0: + + ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p + + ProxyJump + Specifies one or more jump proxies as either [user@]host[:port] + or an ssh URI. Multiple proxies may be separated by comma + characters and will be visited sequentially. Setting this option + will cause ssh(1) to connect to the target host by first making + an ssh(1) connection to the specified ProxyJump host and then + establishing a TCP forwarding to the ultimate target from there. + Setting the host to none disables this option entirely. + + Note that this option will compete with the ProxyCommand option - + whichever is specified first will prevent later instances of the + other from taking effect. + + Note also that the configuration for the destination host (either + supplied via the command-line or the configuration file) is not + generally applied to jump hosts. ~/.ssh/config should be used if + specific configuration is required for jump hosts. + + ProxyUseFdpass + Specifies that ProxyCommand will pass a connected file descriptor + back to ssh(1) instead of continuing to execute and pass data. + The default is no. + + PubkeyAcceptedAlgorithms + Specifies the signature algorithms that will be used for public + key authentication as a comma-separated list of patterns. If the + specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the algorithms + after it will be appended to the default instead of replacing it. + If the specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y character, then the + specified algorithms (including wildcards) will be removed from + the default set instead of replacing them. If the specified list + begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the specified algorithms will + be placed at the head of the default set. The default for this + option is: + + ssh-ed25519-cert-v01@openssh.com, + ecdsa-sha2-nistp256-cert-v01@openssh.com, + ecdsa-sha2-nistp384-cert-v01@openssh.com, + ecdsa-sha2-nistp521-cert-v01@openssh.com, + sk-ssh-ed25519-cert-v01@openssh.com, + sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + rsa-sha2-512-cert-v01@openssh.com, + rsa-sha2-256-cert-v01@openssh.com, + ssh-mldsa44-ed25519-cert-v01@openssh.com, + ssh-ed25519, + ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, + sk-ssh-ed25519@openssh.com, + sk-ecdsa-sha2-nistp256@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256@openssh.com, + rsa-sha2-512,rsa-sha2-256, + ssh-mldsa44-ed25519@openssh.com + + The list of available signature algorithms may also be obtained + using "ssh -Q PubkeyAcceptedAlgorithms". + + PubkeyAuthentication + Specifies whether to try public key authentication. The argument + to this keyword must be yes (the default), no, unbound or + host-bound. The final two options enable public key + authentication while respectively disabling or enabling the + OpenSSH host-bound authentication protocol extension required for + restricted ssh-agent(1) forwarding. + + RefuseConnection + Allows a connection to be refused by the configuration file. If + this option is specified, then ssh(1) will terminate immediately + before attempting to connect to the remote host, display an error + message that contains the argument to this keyword and return a + non-zero exit status. This option may be useful to express + reminders or warnings to the user via ssh_config. + + RekeyLimit + Specifies the maximum amount of data that may be transmitted or + received before the session key is renegotiated, optionally + followed by a maximum amount of time that may pass before the + session key is renegotiated. The first argument is specified in + bytes and may have a suffix of M-bM-^@M-^XKM-bM-^@M-^Y, M-bM-^@M-^XMM-bM-^@M-^Y, or M-bM-^@M-^XGM-bM-^@M-^Y to indicate + Kilobytes, Megabytes, or Gigabytes, respectively. The default is + between M-bM-^@M-^X1GM-bM-^@M-^Y and M-bM-^@M-^X4GM-bM-^@M-^Y, depending on the cipher. The optional + second value is specified in seconds and may use any of the units + documented in the TIME FORMATS section of sshd_config(5). The + default value for RekeyLimit is default none, which means that + rekeying is performed after the cipher's default amount of data + has been sent or received and no time based rekeying is done. + + RemoteCommand + Specifies a command to execute on the remote machine after + successfully connecting to the server. The command string + extends to the end of the line, and is executed with the user's + shell. Arguments to RemoteCommand accept the tokens described in + the TOKENS section. + + RemoteForward + Specifies that a TCP port or Unix-domain socket on the remote + machine be forwarded over the secure channel. The remote port + may either be forwarded to a specified host and port or Unix- + domain socket from the local machine, or may act as a SOCKS 4/5 + proxy that allows a remote client to connect to arbitrary + destinations from the local machine. The first argument is the + listening specification and may be [bind_address:]port or, if the + remote host supports it, a Unix domain socket path. If + forwarding to a specific destination then the second argument + must be host:hostport or a Unix domain socket path, otherwise if + no destination argument is specified then the remote forwarding + will be established as a SOCKS proxy. When acting as a SOCKS + proxy, the destination of the connection can be restricted by + PermitRemoteOpen. + + IPv6 addresses can be specified by enclosing addresses in square + brackets. + + If either argument contains a '/' in it, that argument will be + interpreted as a Unix-domain socket (on the corresponding host) + rather than a TCP port. + + Multiple forwardings may be specified, and additional forwardings + can be given on the command line. Privileged ports can be + forwarded only when logging in as root on the remote machine. + Unix domain socket paths may use the tokens described in the + TOKENS section and environment variables as described in the + ENVIRONMENT VARIABLES section. + + If the port argument is 0, the listen port will be dynamically + allocated on the server and reported to the client at run time. + + If the bind_address is not specified, the default is to only bind + to loopback addresses. If the bind_address is M-bM-^@M-^X*M-bM-^@M-^Y or an empty + string, then the forwarding is requested to listen on all + interfaces. Specifying a remote bind_address will only succeed + if the server's GatewayPorts option is enabled (see + sshd_config(5)). + + RequestTTY + Specifies whether to request a pseudo-tty for the session. The + argument may be one of: no (never request a TTY), yes (always + request a TTY when standard input is a TTY), force (always + request a TTY) or auto (request a TTY when opening a login + session). This option mirrors the -t and -T flags for ssh(1). + + RequiredRSASize + Specifies the minimum RSA key size (in bits) that ssh(1) will + accept. User authentication keys smaller than this limit will be + ignored. Servers that present host keys smaller than this limit + will cause the connection to be terminated. The default is 1024 + bits. Note that this limit may only be raised from the default. + + RevokedHostKeys + Specifies revoked host public keys. Keys listed in this file + will be refused for host authentication. Note that if this file + does not exist or is not readable, then host authentication will + be refused for all hosts. Keys may be specified as a text file, + listing one public key per line, or as an OpenSSH Key Revocation + List (KRL) as generated by ssh-keygen(1). For more information + on KRLs, see the KEY REVOCATION LISTS section in ssh-keygen(1). + Arguments to RevokedHostKeys may use the tilde syntax to refer to + a user's home directory, the tokens described in the TOKENS + section and environment variables as described in the ENVIRONMENT + VARIABLES section. + + SecurityKeyProvider + Specifies a path to a library that will be used when loading any + FIDO authenticator-hosted keys, overriding the default of using + the built-in USB HID support. + + If the specified value begins with a M-bM-^@M-^X$M-bM-^@M-^Y character, then it will + be treated as an environment variable containing the path to the + library. + + SendEnv + Specifies what variables from the local environ(7) should be sent + to the server. The server must also support it, and the server + must be configured to accept these environment variables. Note + that the TERM environment variable is always sent whenever a + pseudo-terminal is requested as it is required by the protocol. + Refer to AcceptEnv in sshd_config(5) for how to configure the + server. Variables are specified by name, which may contain + wildcard characters. Multiple environment variables may be + separated by whitespace or spread across multiple SendEnv + directives. + + See PATTERNS for more information on patterns. + + It is possible to clear previously set SendEnv variable names by + prefixing patterns with -. The default is not to send any + environment variables. + + ServerAliveCountMax + Sets the number of server alive messages (see below) which may be + sent without ssh(1) receiving any messages back from the server. + If this threshold is reached while server alive messages are + being sent, ssh will disconnect from the server, terminating the + session. It is important to note that the use of server alive + messages is very different from TCPKeepAlive (below). The server + alive messages are sent through the encrypted channel and + therefore will not be spoofable. The TCP keepalive option + enabled by TCPKeepAlive is spoofable. The server alive mechanism + is valuable when the client or server depend on knowing when a + connection has become unresponsive. + + The default value is 3. If, for example, ServerAliveInterval + (see below) is set to 15 and ServerAliveCountMax is left at the + default, if the server becomes unresponsive, ssh will disconnect + after approximately 45 seconds. + + ServerAliveInterval + Sets a timeout interval in seconds after which if no data has + been received from the server, ssh(1) will send a message through + the encrypted channel to request a response from the server. The + default is 0, indicating that these messages will not be sent to + the server. + + SessionType + May be used to either request invocation of a subsystem on the + remote system, or to prevent the execution of a remote command at + all. The latter is useful for just forwarding ports. The + argument to this keyword must be none (same as the -N option), + subsystem (same as the -s option) or default (shell or command + execution). + + SetEnv Directly specify one or more environment variables and their + contents to be sent to the server in the form M-bM-^@M-^\NAME=VALUEM-bM-^@M-^]. + Similarly to SendEnv, with the exception of the TERM variable, + the server must be prepared to accept the environment variable. + + The M-bM-^@M-^\VALUEM-bM-^@M-^] may use the tokens described in the TOKENS section + and environment variables as described in the ENVIRONMENT + VARIABLES section. + + StdinNull + Redirects stdin from /dev/null (actually, prevents reading from + stdin). Either this or the equivalent -n option must be used + when ssh is run in the background. The argument to this keyword + must be yes (same as the -n option) or no (the default). + + StreamLocalBindMask + Sets the octal file creation mode mask (umask) used when creating + a Unix-domain socket file for local or remote port forwarding. + This option is only used for port forwarding to a Unix-domain + socket file. + + The default value is 0177, which creates a Unix-domain socket + file that is readable and writable only by the owner. Note that + not all operating systems honor the file mode on Unix-domain + socket files. + + StreamLocalBindUnlink + Specifies whether to remove an existing Unix-domain socket file + for local or remote port forwarding before creating a new one. + If the socket file already exists and StreamLocalBindUnlink is + not enabled, ssh will be unable to forward the port to the Unix- + domain socket file. This option is only used for port forwarding + to a Unix-domain socket file. + + The argument must be yes or no (the default). + + StrictHostKeyChecking + If this flag is set to yes, ssh(1) will never automatically add + host keys to the ~/.ssh/known_hosts file, and refuses to connect + to hosts whose host key has changed. This provides maximum + protection against man-in-the-middle (MITM) attacks, though it + can be annoying when the /etc/ssh/ssh_known_hosts file is poorly + maintained or when connections to new hosts are frequently made. + This option forces the user to manually add all new hosts. + + If this flag is set to accept-new then ssh will automatically add + new host keys to the user's known_hosts file, but will not permit + connections to hosts with changed host keys. If this flag is set + to no or off, ssh will automatically add new host keys to the + user known hosts files and allow connections to hosts with + changed hostkeys to proceed, subject to some restrictions. If + this flag is set to ask (the default), new host keys will be + added to the user known host files only after the user has + confirmed that is what they really want to do, and ssh will + refuse to connect to hosts whose host key has changed. The host + keys of known hosts will be verified automatically in all cases. + + SyslogFacility + Gives the facility code that is used when logging messages from + ssh(1). The possible values are: DAEMON, USER, AUTH, LOCAL0, + LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The + default is USER. + + TCPKeepAlive + Specifies whether the system should send TCP keepalive messages + to the other side. If they are sent, death of the connection or + crash of one of the machines will be properly noticed. However, + this means that connections will die if the route is down + temporarily, and some people find it annoying. + + The default is yes (to send TCP keepalive messages), and the + client will notice if the network goes down or the remote host + dies. This is important in scripts, and many users want it too. + + To disable TCP keepalive messages, the value should be set to no. + See also ServerAliveInterval for protocol-level keepalives. + + Tag Specify a configuration tag name that may be later used by a + Match directive to select a block of configuration. + + Tunnel Request tun(4) device forwarding between the client and the + server. The argument must be yes, point-to-point (layer 3), + ethernet (layer 2), or no (the default). Specifying yes requests + the default tunnel mode, which is point-to-point. + + TunnelDevice + Specifies the tun(4) devices to open on the client (local_tun) + and the server (remote_tun). + + The argument must be local_tun[:remote_tun]. The devices may be + specified by numerical ID or the keyword any, which uses the next + available tunnel device. If remote_tun is not specified, it + defaults to any. The default is any:any. + + UpdateHostKeys + Specifies whether ssh(1) should accept notifications of + additional hostkeys from the server sent after authentication has + completed and add them to UserKnownHostsFile. The argument must + be yes, no or ask. This option allows learning alternate + hostkeys for a server and supports graceful key rotation by + allowing a server to send replacement public keys before old ones + are removed. + + Additional hostkeys are only accepted if the key used to + authenticate the host was already trusted or explicitly accepted + by the user, the host was authenticated via UserKnownHostsFile + (i.e. not GlobalKnownHostsFile) and the host was authenticated + using a plain key and not a certificate. + + UpdateHostKeys is enabled by default if the user has not + overridden the default UserKnownHostsFile setting and has not + enabled VerifyHostKeyDNS, otherwise UpdateHostKeys will be set to + no. + + If UpdateHostKeys is set to ask, then the user is asked to + confirm the modifications to the known_hosts file. Confirmation + is currently incompatible with ControlPersist, and will be + disabled if it is enabled. + + Presently, only sshd(8) from OpenSSH 6.8 and greater support the + "hostkeys@openssh.com" protocol extension used to inform the + client of all the server's hostkeys. + + User Specifies the user to log in as. This can be useful when a + different user name is used on different machines. This saves + the trouble of having to remember to give the user name on the + command line. Arguments to User may use the tokens described in + the TOKENS section (with the exception of %r and %C) and + environment variables as described in the ENVIRONMENT VARIABLES + section. + + UserKnownHostsFile + Specifies one or more files to use for the user host key + database, separated by whitespace. Each filename may use tilde + notation to refer to the user's home directory, the tokens + described in the TOKENS section and environment variables as + described in the ENVIRONMENT VARIABLES section. A value of none + causes ssh(1) to ignore any user-specific known hosts files. The + default is ~/.ssh/known_hosts, ~/.ssh/known_hosts2. + + VerifyHostKeyDNS + Specifies whether to verify the remote key using DNS and SSHFP + resource records. If this option is set to yes, the client will + implicitly trust keys that match a secure fingerprint from DNS. + Insecure fingerprints will be handled as if this option was set + to ask. If this option is set to ask, information on fingerprint + match will be displayed, but the user will still need to confirm + new host keys according to the StrictHostKeyChecking option. The + default is no. + + See also VERIFYING HOST KEYS in ssh(1). + + VersionAddendum + Optionally specifies additional text to append to the SSH + protocol banner sent by the client upon connection. The default + is none. + + VisualHostKey + If this flag is set to yes, an ASCII art representation of the + remote host key fingerprint is printed in addition to the + fingerprint string at login and for unknown host keys. If this + flag is set to no (the default), no fingerprint strings are + printed at login and only the fingerprint string will be printed + for unknown host keys. + + WarnWeakCrypto + controls whether the user is warned when the cryptographic + algorithms negotiated for the connection are weak or otherwise + recommended against. Warnings may be disabled by turning off a + specific warning or by disabling all warnings. Warnings about + connections that don't use a post-quantum key exchange may be + disabled using the no-pq-kex flag. no will disable all warnings. + The default, equivalent to yes, is to enable all warnings. + + XAuthLocation + Specifies the full pathname of the xauth(1) program. The default + is /usr/X11R6/bin/xauth. + +PATTERNS + A pattern consists of zero or more non-whitespace characters, M-bM-^@M-^X*M-bM-^@M-^Y (a + wildcard that matches zero or more characters), or M-bM-^@M-^X?M-bM-^@M-^Y (a wildcard that + matches exactly one character). For example, to specify a set of + declarations for any host in the ".co.uk" set of domains, the following + pattern could be used: + + Host *.co.uk + + The following pattern would match any host in the 192.168.0.[0-9] network + range: + + Host 192.168.0.? + + A pattern-list is a comma-separated list of patterns. Patterns within + pattern-lists may be negated by preceding them with an exclamation mark + (M-bM-^@M-^X!M-bM-^@M-^Y). For example, to allow a key to be used from anywhere within an + organization except from the "dialup" pool, the following entry (in + authorized_keys) could be used: + + from="!*.dialup.example.com,*.example.com" + + Note that a negated match will never produce a positive result by itself. + For example, attempting to match "host3" against the following pattern- + list will fail: + + from="!host1,!host2" + + The solution here is to include a term that will yield a positive match, + such as a wildcard: + + from="!host1,!host2,*" + +TOKENS + Arguments to some keywords can make use of tokens, which are expanded at + runtime. Tokens are expanded without quoting or escaping of shell + characters. It is the user's responsibility to ensure they are safe in + the context of their use. + + The supported tokens in ssh_config are: + + %% A literal M-bM-^@M-^X%M-bM-^@M-^Y. + %C Hash of %l%h%p%r%j. + %d Local user's home directory. + %f The fingerprint of the server's host key. + %H The known_hosts hostname or address that is being searched + for. + %h The remote hostname. + %I A string describing the reason for a KnownHostsCommand + execution: either ADDRESS when looking up a host by address + (only when CheckHostIP is enabled), HOSTNAME when searching + by hostname, or ORDER when preparing the host key algorithm + preference list to use for the destination host. + %i The local user ID. + %j The contents of the ProxyJump option, or the empty string if + this option is unset. + %K The base64 encoded host key. + %k The host key alias if specified, otherwise the original + remote hostname given on the command line. + %L The local hostname. + %l The local hostname, including the domain name. + %n The original remote hostname, as given on the command line. + %p The remote port. + %r The remote username. + %T The local tun(4) or tap(4) network interface assigned if + tunnel forwarding was requested, or "NONE" otherwise. + %t The type of the server host key, e.g. ssh-ed25519. + %u The local username. + + CertificateFile, ControlPath, IdentityAgent, IdentityFile, Include, + KnownHostsCommand, LocalForward, Match exec, RemoteCommand, + RemoteForward, RevokedHostKeys, UserKnownHostsFile and VersionAddendum + accept the tokens %%, %C, %d, %h, %i, %j, %k, %L, %l, %n, %p, %r, and %u. + + KnownHostsCommand additionally accepts the tokens %f, %H, %I, %K and %t. + + Hostname accepts the tokens %% and %h. + + LocalCommand accepts all tokens. + + ProxyCommand and ProxyJump accept the tokens %%, %h, %n, %p, and %r. + + Note that some of these directives build commands for execution via the + shell. Because ssh(1) performs no filtering or escaping of characters + that have special meaning in shell commands (e.g. quotes), it is the + user's responsibility to ensure that the arguments passed to ssh(1) do + not contain such characters and that tokens are appropriately quoted when + used. + +ENVIRONMENT VARIABLES + Arguments to some keywords can be expanded at runtime from environment + variables on the client by enclosing them in ${}, for example + ${HOME}/.ssh would refer to the user's .ssh directory. If a specified + environment variable does not exist then an error will be returned and + the setting for that keyword will be ignored. + + The keywords CertificateFile, ControlPath, IdentityAgent, IdentityFile, + Include, KnownHostsCommand, and UserKnownHostsFile support environment + variables. The keywords LocalForward and RemoteForward support + environment variables only for Unix domain socket paths. + +FILES + ~/.ssh/config + This is the per-user configuration file. The format of this file + is described above. This file is used by the SSH client. + Because of the potential for abuse, this file must have strict + permissions: read/write for the user, and not writable by others. + + /etc/ssh/ssh_config + Systemwide configuration file. This file provides defaults for + those values that are not specified in the user's configuration + file, and for those users who do not have a configuration file. + This file must be world-readable. + +SEE ALSO + ssh(1) + +AUTHORS + OpenSSH is a derivative of the original and free ssh 1.2.12 release by + Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo + de Raadt and Dug Song removed many bugs, re-added newer features and + created OpenSSH. Markus Friedl contributed the support for SSH protocol + versions 1.5 and 2.0. + +OpenBSD 8.0 July 11, 2026 SSH_CONFIG(5) diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c index 7516fd588065..34463dc94831 100644 --- a/sshbuf-getput-crypto.c +++ b/sshbuf-getput-crypto.c @@ -24,9 +24,7 @@ #ifdef WITH_OPENSSL #include -#ifdef OPENSSL_HAS_ECC -# include -#endif /* OPENSSL_HAS_ECC */ +#include #include "ssherr.h" #define SSHBUF_INTERNAL @@ -55,7 +53,6 @@ sshbuf_get_bignum2(struct sshbuf *buf, BIGNUM **valp) return 0; } -#ifdef OPENSSL_HAS_ECC static int get_ec(const u_char *d, size_t len, EC_POINT *v, const EC_GROUP *g) { @@ -125,7 +122,6 @@ sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v) } return 0; } -#endif /* OPENSSL_HAS_ECC */ int sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v) @@ -149,7 +145,6 @@ sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v) return 0; } -#ifdef OPENSSL_HAS_ECC int sshbuf_put_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g) { @@ -186,5 +181,4 @@ sshbuf_put_ec_pkey(struct sshbuf *buf, EVP_PKEY *pkey) return SSH_ERR_LIBCRYPTO_ERROR; return sshbuf_put_eckey(buf, ec); } -#endif /* OPENSSL_HAS_ECC */ #endif /* WITH_OPENSSL */ diff --git a/sshbuf.h b/sshbuf.h index f0ad0bb4b8b9..af8154639487 100644 --- a/sshbuf.h +++ b/sshbuf.h @@ -24,11 +24,16 @@ #include #ifdef WITH_OPENSSL -# include -# include -# ifdef OPENSSL_HAS_ECC -# include -# endif /* OPENSSL_HAS_ECC */ +#include +#include +#include +#include +#else /* OPENSSL */ +#define BIGNUM void +#define EC_KEY void +#define EC_GROUP void +#define EC_POINT void +#define EVP_PKEY void #endif /* WITH_OPENSSL */ #define SSHBUF_SIZE_MAX 0x8000000 /* Hard maximum size 128MB */ @@ -266,20 +271,16 @@ int sshbuf_peek_string_direct(const struct sshbuf *buf, const u_char **valp, * Functions to extract or store SSH wire encoded bignums and elliptic * curve points. */ -int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len); +int sshbuf_get_bignum2(struct sshbuf *buf, BIGNUM **valp); int sshbuf_get_bignum2_bytes_direct(struct sshbuf *buf, const u_char **valp, size_t *lenp); -#ifdef WITH_OPENSSL -int sshbuf_get_bignum2(struct sshbuf *buf, BIGNUM **valp); int sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v); -# ifdef OPENSSL_HAS_ECC +int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len); int sshbuf_get_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g); int sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v); int sshbuf_put_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g); int sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v); int sshbuf_put_ec_pkey(struct sshbuf *buf, EVP_PKEY *pkey); -# endif /* OPENSSL_HAS_ECC */ -#endif /* WITH_OPENSSL */ /* Functions to extract or store various non-SSH wire encoded values */ int sshbuf_get_nulterminated_string(struct sshbuf *buf, size_t maxlen, diff --git a/sshconnect.h b/sshconnect.h index 2ac2c07e005a..aad13c20cbf4 100644 --- a/sshconnect.h +++ b/sshconnect.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.h,v 1.51 2026/07/06 07:49:58 djm Exp $ */ +/* $OpenBSD: sshconnect.h,v 1.52 2026/08/03 06:47:24 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -91,6 +91,8 @@ void ssh_kex2(struct ssh *ssh, char *, struct sockaddr_storage *, u_short, void ssh_userauth2(struct ssh *ssh, const char *, const char *, char *, Sensitive *); +void pubkey_dump(struct ssh *); + int ssh_local_cmd(const char *); void maybe_add_key_to_agent(const char *, struct sshkey *, diff --git a/sshconnect2.c b/sshconnect2.c index 01c6ec5b4e3a..d78d0dc8dae9 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.388 2026/07/06 07:49:58 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.393 2026/08/08 07:25:55 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -235,9 +235,8 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr_storage *hostaddr, xxx_hostaddr = *hostaddr; xxx_conn_info = ssh_conn_info_dup(cinfo); - if (options.rekey_limit || options.rekey_interval) - ssh_packet_set_rekey_limits(ssh, options.rekey_limit, - options.rekey_interval); + ssh_packet_set_rekey_limits(ssh, options.rekey_limit, + options.rekey_interval); /* * If the user has not specified HostkeyAlgorithms, or has only @@ -279,13 +278,12 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr_storage *hostaddr, ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_client; ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; -# ifdef OPENSSL_HAS_ECC ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client; -# endif #endif ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_client; ssh->kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_client; ssh->kex->kex[KEX_KEM_MLKEM768X25519_SHA256] = kex_gen_client; + ssh->kex->kex[KEX_KEM_MLKEM768ECDH_SHA256] = kex_gen_client; ssh->kex->verify_host_key=&verify_host_key_callback; ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &ssh->kex->done); @@ -1694,11 +1692,13 @@ get_agent_identities(struct ssh *ssh, int *agent_fdp, debug_fr(r, "ssh_get_authentication_socket"); return r; } - if ((r = ssh_agent_bind_hostkey(agent_fd, ssh->kex->initial_hostkey, - ssh->kex->session_id, ssh->kex->initial_sig, 0)) == 0) - debug_f("bound agent to hostkey"); - else - debug2_fr(r, "ssh_agent_bind_hostkey"); + if (ssh != NULL && ssh->kex != NULL) { + if ((r = ssh_agent_bind_hostkey(agent_fd, ssh->kex->initial_hostkey, + ssh->kex->session_id, ssh->kex->initial_sig, 0)) == 0) + debug_f("bound agent to hostkey"); + else + debug2_fr(r, "ssh_agent_bind_hostkey"); + } if ((r = ssh_fetch_identitylist(agent_fd, &idlist)) != 0) { debug_fr(r, "ssh_fetch_identitylist"); @@ -1712,19 +1712,109 @@ get_agent_identities(struct ssh *ssh, int *agent_fdp, return 0; } +/* + * Returns nonzero if the certificate extensions/critical-options section + * has the specified option present, zero otherwise. + */ +static int +cert_has_option(struct sshbuf *oblob, const char *target) +{ + struct sshbuf *c = NULL, *data = NULL; + char *name = NULL; + int r, found = 0; + + if (oblob == NULL || (c = sshbuf_fromb(oblob)) == NULL) + return 0; + while (sshbuf_len(c) > 0) { + sshbuf_free(data); + data = NULL; + free(name); + name = NULL; + if ((r = sshbuf_get_cstring(c, &name, NULL)) != 0 || + (r = sshbuf_froms(c, &data)) != 0) + break; + if (strcmp(name, target) == 0) { + found = 1; + break; + } + } + sshbuf_free(data); + free(name); + sshbuf_free(c); + return found; +} + +/* + * Returns an integer describing the priority of the identity + * within its group. Lower numbers are higher priority. + */ +#define MAX_ID_PRIORITY 3 +static int +identity_prioritise(struct identity *id) +{ + if (id == NULL || id->key == NULL) + return 3; + if (!sshkey_is_cert(id->key) || id->key->cert == NULL) + return 3; + if (sshkey_is_sk(id->key) && + cert_has_option(id->key->cert->critical, "verify-required")) + return 2; + if (sshkey_is_sk(id->key) && + cert_has_option(id->key->cert->extensions, "no-touch-required")) + return 0; + return 1; +} + +static void +order_identities_by_prio(struct idlist *list) +{ + struct idlist prio[MAX_ID_PRIORITY + 1], sorted; + struct identity *id, *tmp, *dummy; + int p; + + for (p = 0; p <= MAX_ID_PRIORITY; p++) + TAILQ_INIT(&prio[p]); + TAILQ_INIT(&sorted); + + TAILQ_FOREACH_SAFE(id, list, next, tmp) { + if (id->userprovided) + continue; + dummy = xcalloc(1, sizeof(*dummy)); + dummy->userprovided = -1; + TAILQ_INSERT_BEFORE(id, dummy, next); + TAILQ_REMOVE(list, id, next); + p = identity_prioritise(id); + if (p < 0 || p > MAX_ID_PRIORITY) + fatal_f("internal error: bad priority"); + TAILQ_INSERT_TAIL(&prio[p], id, next); + } + for (p = 0; p <= MAX_ID_PRIORITY; p++) + TAILQ_CONCAT(&sorted, &prio[p], next); + + TAILQ_FOREACH_SAFE(id, list, next, tmp) { + if (id->userprovided != -1) + continue; + struct identity *s = TAILQ_FIRST(&sorted); + TAILQ_REMOVE(&sorted, s, next); + TAILQ_INSERT_BEFORE(id, s, next); + TAILQ_REMOVE(list, id, next); + free(id); + } +} + /* * try keys in the following order: * 1. certificates listed in the config file - * 2. other input certificates - * 3. agent keys that are found in the config file - * 4. other agent keys + * 2. agent keys that are found in the config file + * 3. other agent keys + * 4. PKCS#11 keys that are found in the config file * 5. keys that are only listed in the config file */ static void pubkey_prepare(struct ssh *ssh, Authctxt *authctxt) { struct identity *id, *id2, *tmp; - struct idlist agent, files, *preferred; + struct idlist agent, files, certs, agent_keys, *preferred; struct sshkey *key; int disallowed, agent_fd = -1, i, r, found; size_t j; @@ -1733,6 +1823,8 @@ pubkey_prepare(struct ssh *ssh, Authctxt *authctxt) TAILQ_INIT(&agent); /* keys from the agent */ TAILQ_INIT(&files); /* keys from the config file */ + TAILQ_INIT(&certs); /* certificates specified by user */ + TAILQ_INIT(&agent_keys); /* keys supported by the agent */ preferred = &authctxt->keys; TAILQ_INIT(preferred); /* preferred order of keys */ @@ -1759,6 +1851,7 @@ pubkey_prepare(struct ssh *ssh, Authctxt *authctxt) id->userprovided = options.identity_file_userprovided[i]; TAILQ_INSERT_TAIL(&files, id, next); } + /* list of certificates specified by user */ for (i = 0; i < options.num_certificate_files; i++) { key = options.certificates[i]; @@ -1780,8 +1873,11 @@ pubkey_prepare(struct ssh *ssh, Authctxt *authctxt) id->key = key; id->filename = xstrdup(options.certificate_files[i]); id->userprovided = options.certificate_file_userprovided[i]; - TAILQ_INSERT_TAIL(preferred, id, next); + TAILQ_INSERT_TAIL(&certs, id, next); } + order_identities_by_prio(&certs); + TAILQ_CONCAT(preferred, &certs, next); + /* list of keys supported by the agent */ if ((r = get_agent_identities(ssh, &agent_fd, &idlist)) == 0) { for (j = 0; j < idlist->nkeys; j++) { @@ -1799,7 +1895,7 @@ pubkey_prepare(struct ssh *ssh, Authctxt *authctxt) */ if (sshkey_equal(idlist->keys[j], id->key)) { TAILQ_REMOVE(&files, id, next); - TAILQ_INSERT_TAIL(preferred, id, next); + TAILQ_INSERT_TAIL(&agent_keys, id, next); id->agent_fd = agent_fd; found = 1; break; @@ -1818,7 +1914,9 @@ pubkey_prepare(struct ssh *ssh, Authctxt *authctxt) } ssh_free_identitylist(idlist); /* append remaining agent keys */ - TAILQ_CONCAT(preferred, &agent, next); + TAILQ_CONCAT(&agent_keys, &agent, next); + order_identities_by_prio(&agent_keys); + TAILQ_CONCAT(preferred, &agent_keys, next); authctxt->agent_fd = agent_fd; } /* Prefer PKCS11 keys that are explicitly listed */ @@ -1843,6 +1941,7 @@ pubkey_prepare(struct ssh *ssh, Authctxt *authctxt) freezero(id, sizeof(*id)); } } + order_identities_by_prio(&files); /* append remaining keys from the config file */ TAILQ_CONCAT(preferred, &files, next); /* finally, filter by PubkeyAcceptedAlgorithms */ @@ -1856,7 +1955,8 @@ pubkey_prepare(struct ssh *ssh, Authctxt *authctxt) "not in PubkeyAcceptedAlgorithms", sshkey_ssh_name(id->key), id->filename); disallowed = 1; - } else if (ssh->kex->server_sig_algs != NULL && + } else if (ssh != NULL && ssh->kex != NULL && + ssh->kex->server_sig_algs != NULL && (cp = key_sig_algorithm(ssh, id->key)) == NULL) { debug("Skipping %s key %s - corresponding algorithm " "not supported by server", @@ -1900,6 +2000,27 @@ pubkey_cleanup(struct ssh *ssh) } } +void +pubkey_dump(struct ssh *ssh) +{ + Authctxt authctxt; + Identity *id; + char *ident; + + memset(&authctxt, 0, sizeof(authctxt)); + authctxt.agent_fd = -1; + ssh->authctxt = &authctxt; + + pubkey_prepare(ssh, &authctxt); + TAILQ_FOREACH(id, &authctxt.keys, next) { + ident = format_identity(id); + fprintf(stdout, "%s\n", ident); + free(ident); + } + pubkey_cleanup(ssh); + ssh->authctxt = NULL; +} + static void pubkey_reset(Authctxt *authctxt) { diff --git a/sshd-auth.c b/sshd-auth.c index 4793c2b8c6f6..92c1725ac7a6 100644 --- a/sshd-auth.c +++ b/sshd-auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd-auth.c,v 1.16 2026/06/14 03:59:34 djm Exp $ */ +/* $OpenBSD: sshd-auth.c,v 1.18 2026/07/27 12:28:52 markus Exp $ */ /* * SSH2 implementation: * Privilege Separation: @@ -826,10 +826,9 @@ do_ssh2_kex(struct ssh *ssh) kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server; kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -# ifdef OPENSSL_HAS_ECC kex->kex[KEX_ECDH_SHA2] = kex_gen_server; -# endif /* OPENSSL_HAS_ECC */ -#endif /* WITH_OPENSSL */ + kex->kex[KEX_KEM_MLKEM768ECDH_SHA256] = kex_gen_server; +#endif kex->kex[KEX_C25519_SHA256] = kex_gen_server; kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_server; kex->kex[KEX_KEM_MLKEM768X25519_SHA256] = kex_gen_server; diff --git a/sshd-session.c b/sshd-session.c index 1f4323924b4d..91f7285eef3d 100644 --- a/sshd-session.c +++ b/sshd-session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd-session.c,v 1.24 2026/06/14 03:59:34 djm Exp $ */ +/* $OpenBSD: sshd-session.c,v 1.25 2026/07/09 02:20:19 djm Exp $ */ /* * SSH2 implementation: * Privilege Separation: @@ -1260,6 +1260,8 @@ main(int ac, char **av) /* Now user is authenticated */ + setproctitle("%s [postauth]", authctxt->user); + /* * Cancel the alarm we set to limit the time taken for * authentication. diff --git a/sshd.0 b/sshd.0 new file mode 100644 index 000000000000..69f67b31a361 --- /dev/null +++ b/sshd.0 @@ -0,0 +1,692 @@ +SSHD(8) System Manager's Manual SSHD(8) + +NAME + sshd M-bM-^@M-^S OpenSSH daemon + +SYNOPSIS + sshd [-46DdeGiqTtV] [-C connection_spec] [-c host_certificate_file] + [-E log_file] [-f config_file] [-g login_grace_time] + [-h host_key_file] [-o option] [-p port] [-u len] + +DESCRIPTION + sshd (OpenSSH Daemon) is the daemon program for ssh(1). It provides + secure encrypted communications between two untrusted hosts over an + insecure network. + + sshd listens for connections from clients. It is normally started at + boot from /etc/rc. It forks a new daemon for each incoming connection. + The forked daemons handle key exchange, encryption, authentication, + command execution, and data exchange. + + sshd can be configured using command-line options or a configuration file + (by default sshd_config(5)); command-line options override values + specified in the configuration file. sshd rereads its configuration file + when it receives a hangup signal, SIGHUP, by executing itself with the + name and options it was started with, e.g. /usr/sbin/sshd. + + The options are as follows: + + -4 Forces sshd to use IPv4 addresses only. + + -6 Forces sshd to use IPv6 addresses only. + + -C connection_spec + Specify the connection parameters to use for the -T extended test + mode. If provided, any Match directives in the configuration + file that would apply are applied before the configuration is + written to standard output. The connection parameters are + supplied as keyword=value pairs and may be supplied in any order, + either with multiple -C options or as a comma-separated list. + The keywords are M-bM-^@M-^\addrM-bM-^@M-^], M-bM-^@M-^\userM-bM-^@M-^], M-bM-^@M-^\hostM-bM-^@M-^], M-bM-^@M-^\laddrM-bM-^@M-^], M-bM-^@M-^\lportM-bM-^@M-^], and + M-bM-^@M-^\rdomainM-bM-^@M-^] and correspond to source address, user, resolved source + host name, local address, local port number and routing domain + respectively. Additionally the M-bM-^@M-^\invalid-userM-bM-^@M-^] flag (which does + not take a value argument) may be specified to simulate a + connection from an unrecognised username. + + -c host_certificate_file + Specifies a path to a certificate file to identify sshd during + key exchange. The certificate file must match a host key file + specified using the -h option or the HostKey configuration + directive. + + -D When this option is specified, sshd will not detach and does not + become a daemon. This allows easy monitoring of sshd. + + -d Debug mode. The server sends verbose debug output to standard + error, and does not put itself in the background. The server + also will not fork(2) and will only process one connection. This + option is only intended for debugging for the server. Multiple + -d options increase the debugging level. Maximum is 3. + + -E log_file + Append debug logs to log_file instead of the system log. + + -e Write debug logs to standard error instead of the system log. + + -f config_file + Specifies the name of the configuration file. The default is + /etc/ssh/sshd_config. sshd refuses to start if there is no + configuration file. + + -G Parse and print configuration file. Check the validity of the + configuration file, output the effective configuration to stdout + and then exit. Optionally, Match rules may be applied by + specifying the connection parameters using one or more -C + options. + + -g login_grace_time + Gives the grace time for clients to authenticate themselves + (default 120 seconds). If the client fails to authenticate the + user within this many seconds, the server disconnects and exits. + A value of zero indicates no limit. + + -h host_key_file + Specifies a file from which a host key is read. This option must + be given if sshd is not run as root (as the normal host key files + are normally not readable by anyone but root). The default is + /etc/ssh/ssh_host_ecdsa_key, /etc/ssh/ssh_host_ed25519_key, + /etc/ssh/ssh_host_mldsa44_ed25519_key and + /etc/ssh/ssh_host_rsa_key. It is possible to have multiple host + key files for the different host key algorithms. + + -i Specifies that sshd is being run from inetd(8). + + -o option + Can be used to give options in the format used in the + configuration file. This is useful for specifying options for + which there is no separate command-line flag. For full details + of the options, and their values, see sshd_config(5). + + -p port + Specifies the port on which the server listens for connections + (default 22). Multiple port options are permitted. Ports + specified in the configuration file with the Port option are + ignored when a command-line port is specified. Ports specified + using the ListenAddress option override command-line ports. + + -q Quiet mode. Nothing is sent to the system log. Normally the + beginning, authentication, and termination of each connection is + logged. + + -T Extended test mode. Check the validity of the configuration + file, output the effective configuration to stdout and then exit. + Optionally, Match rules may be applied by specifying the + connection parameters using one or more -C options. This is + similar to the -G flag, but it includes the additional testing + performed by the -t flag. + + -t Test mode. Only check the validity of the configuration file and + sanity of the keys. This is useful for updating sshd reliably as + configuration options may change. + + -u len This option is used to specify the size of the field in the utmp + structure that holds the remote host name. If the resolved host + name is longer than len, the dotted decimal value will be used + instead. This allows hosts with very long host names that + overflow this field to still be uniquely identified. Specifying + -u0 indicates that only dotted decimal addresses should be put + into the utmp file. -u0 may also be used to prevent sshd from + making DNS requests unless the authentication mechanism or + configuration requires it. Authentication mechanisms that may + require DNS include HostbasedAuthentication and using a + from="pattern-list" option in a key file. Configuration options + that require DNS include using a USER@HOST pattern in AllowUsers + or DenyUsers. + + -V Display the version number and exit. + +AUTHENTICATION + The OpenSSH SSH daemon supports SSH protocol 2 only. Each host has a + host-specific key, used to identify the host. Whenever a client + connects, the daemon responds with its public host key. The client + compares the host key against its own database to verify that it has not + changed. Forward secrecy is provided through a Diffie-Hellman key + agreement. This key agreement results in a shared session key. The rest + of the session is encrypted using a symmetric cipher. The client selects + the encryption algorithm to use from those offered by the server. + Additionally, session integrity is provided through a cryptographic + message authentication code (MAC). + + Finally, the server and the client enter an authentication dialog. The + client tries to authenticate itself using host-based authentication, + public key authentication, challenge-response authentication, or password + authentication. + + Regardless of the authentication type, the account is checked to ensure + that it is accessible. An account is not accessible if it is locked, + listed in DenyUsers or its group is listed in DenyGroups . The + definition of a locked account is system dependent. Some platforms have + their own account database (eg AIX) and some modify the passwd field ( + M-bM-^@M-^X*LK*M-bM-^@M-^Y on Solaris and UnixWare, M-bM-^@M-^X*M-bM-^@M-^Y on HP-UX, containing M-bM-^@M-^XNologinM-bM-^@M-^Y on + Tru64, a leading M-bM-^@M-^X*LOCKED*M-bM-^@M-^Y on FreeBSD and a leading M-bM-^@M-^X!M-bM-^@M-^Y on most + Linuxes). If there is a requirement to disable password authentication + for the account while allowing still public-key, then the passwd field + should be set to something other than these values (eg M-bM-^@M-^XNPM-bM-^@M-^Y or M-bM-^@M-^X*NP*M-bM-^@M-^Y ). + + If the client successfully authenticates itself, a dialog for preparing + the session is entered. At this time the client may request things like + allocating a pseudo-tty, forwarding X11 connections, forwarding TCP + connections, or forwarding the authentication agent connection over the + secure channel. + + After this, the client either requests an interactive shell or execution + of a non-interactive command, which sshd will execute via the user's + shell using its -c option. The sides then enter session mode. In this + mode, either side may send data at any time, and such data is forwarded + to/from the shell or command on the server side, and the user terminal in + the client side. + + When the user program terminates and all forwarded X11 and other + connections have been closed, the server sends command exit status to the + client, and both sides exit. + +LOGIN PROCESS + When a user successfully logs in, sshd does the following: + + 1. If the login is on a tty, and no command has been specified, + prints last login time and /etc/motd (unless prevented in the + configuration file or by ~/.hushlogin; see the FILES section). + + 2. If the login is on a tty, records login time. + + 3. Checks /etc/nologin; if it exists, prints contents and quits + (unless root). + + 4. Changes to run with normal user privileges. + + 5. Sets up basic environment. + + 6. Reads the file ~/.ssh/environment, if it exists, and users are + allowed to change their environment. See the + PermitUserEnvironment option in sshd_config(5). + + 7. Changes to user's home directory. + + 8. If ~/.ssh/rc exists and the sshd_config(5) PermitUserRC option + is set, runs it; else if /etc/ssh/sshrc exists, runs it; + otherwise runs xauth(1). The M-bM-^@M-^\rcM-bM-^@M-^] files are given the X11 + authentication protocol and cookie in standard input. See + SSHRC, below. + + 9. Runs user's shell or command. All commands are run under the + user's login shell as specified in the system password + database. + +SSHRC + If the file ~/.ssh/rc exists, sh(1) runs it after reading the environment + files but before starting the user's shell or command. It must not + produce any output on stdout; stderr must be used instead. If X11 + forwarding is in use, it will receive the "proto cookie" pair in its + standard input (and DISPLAY in its environment). The script must call + xauth(1) because sshd will not run xauth automatically to add X11 + cookies. + + The primary purpose of this file is to run any initialization routines + which may be needed before the user's home directory becomes accessible; + AFS is a particular example of such an environment. + + This file will probably contain some initialization code followed by + something similar to: + + if read proto cookie && [ -n "$DISPLAY" ]; then + if [ `echo $DISPLAY | cut -c1-10` = 'localhost:' ]; then + # X11UseLocalhost=yes + echo add unix:`echo $DISPLAY | + cut -c11-` $proto $cookie + else + # X11UseLocalhost=no + echo add $DISPLAY $proto $cookie + fi | xauth -q - + fi + + If this file does not exist, /etc/ssh/sshrc is run, and if that does not + exist either, xauth is used to add the cookie. + +AUTHORIZED_KEYS FILE FORMAT + AuthorizedKeysFile specifies the files containing public keys for public + key authentication; if this option is not specified, the default is + ~/.ssh/authorized_keys and ~/.ssh/authorized_keys2. Each line of the + file contains one key (empty lines and lines starting with a M-bM-^@M-^X#M-bM-^@M-^Y are + ignored as comments). Public keys consist of the following space- + separated fields: options, keytype, base64-encoded key, comment. The + options field is optional. The supported key types are: + + sk-ecdsa-sha2-nistp256@openssh.com + ecdsa-sha2-nistp256 + ecdsa-sha2-nistp384 + ecdsa-sha2-nistp521 + sk-ssh-ed25519@openssh.com + ssh-ed25519 + ssh-mldsa44-ed25519@openssh.com + ssh-rsa + + The comment field is not used for anything (but may be convenient for the + user to identify the key). + + Note that lines in this file can be several hundred bytes long (because + of the size of the public key encoding) up to a limit of 8 kilobytes, + which permits RSA keys up to 16 kilobits. You don't want to type them + in; instead, copy the id_ecdsa.pub, id_ecdsa_sk.pub, id_ed25519.pub, + id_ed25519_sk.pub, id_mldsa44_ed25519, or the id_rsa.pub file and edit + it. + + sshd enforces a minimum RSA key modulus size of 1024 bits. + + The options (if present) consist of comma-separated option + specifications. No spaces are permitted, except within double quotes. + The following option specifications are supported (note that option + keywords are case-insensitive): + + agent-forwarding + Enable authentication agent forwarding previously disabled by the + restrict option. + + cert-authority + Specifies that the listed key is a certification authority (CA) + that is trusted to validate signed certificates for user + authentication. + + Certificates may encode access restrictions similar to these key + options. If both certificate restrictions and key options are + present, the most restrictive union of the two is applied. + + command="command" + Specifies that the command is executed whenever this key is used + for authentication. The command supplied by the user (if any) is + ignored. The command is run on a pty if the client requests a + pty; otherwise it is run without a tty. If an 8-bit clean + channel is required, one must not request a pty or should specify + no-pty. A quote may be included in the command by quoting it + with a backslash. + + This option might be useful to restrict certain public keys to + perform just a specific operation. An example might be a key + that permits remote backups but nothing else. Note that the + client may specify TCP and/or X11 forwarding unless they are + explicitly prohibited, e.g. using the restrict key option. + + The command originally supplied by the client is available in the + SSH_ORIGINAL_COMMAND environment variable. Note that this option + applies to shell, command or subsystem execution. Also note that + this command may be superseded by an sshd_config(5) ForceCommand + directive. + + If a command is specified and a forced-command is embedded in a + certificate used for authentication, then the certificate will be + accepted only if the two commands are identical. + + environment="NAME=value" + Specifies that the string is to be added to the environment when + logging in using this key. Environment variables set this way + override other default environment values. Multiple options of + this type are permitted. Environment processing is disabled by + default and is controlled via the PermitUserEnvironment option. + + expiry-time="timespec" + Specifies a time after which the key will not be accepted. The + time may be specified as a YYYYMMDD[Z] date or a + YYYYMMDDHHMM[SS][Z] time. Dates and times will be interpreted in + the system time zone unless suffixed by a Z character, in which + case they will be interpreted in the UTC time zone. + + from="pattern-list" + Specifies that in addition to public key authentication, either + the canonical name of the remote host or its IP address must be + present in the comma-separated list of patterns. See PATTERNS in + ssh_config(5) for more information on patterns. + + In addition to the wildcard matching that may be applied to + hostnames or addresses, a from stanza may match IP addresses + using CIDR address/masklen notation. + + The purpose of this option is to optionally increase security: + public key authentication by itself does not trust the network or + name servers or anything (but the key); however, if somebody + somehow steals the key, the key permits an intruder to log in + from anywhere in the world. This additional option makes using a + stolen key more difficult (name servers and/or routers would have + to be compromised in addition to just the key). + + no-agent-forwarding + Forbids authentication agent forwarding when this key is used for + authentication. + + no-port-forwarding + Forbids TCP forwarding when this key is used for authentication. + Any port forward requests by the client will return an error. + This might be used, e.g. in connection with the command option. + + no-pty Prevents tty allocation (a request to allocate a pty will fail). + + no-user-rc + Disables execution of ~/.ssh/rc. + + no-X11-forwarding + Forbids X11 forwarding when this key is used for authentication. + Any X11 forward requests by the client will return an error. + + permitlisten="[host:]port" + Limit remote port forwarding with the ssh(1) -R option such that + it may only listen on the specified host (optional) and port. + IPv6 addresses can be specified by enclosing the address in + square brackets. Multiple permitlisten options may be applied + separated by commas. Hostnames may include wildcards as + described in the PATTERNS section in ssh_config(5). A port + specification of * matches any port. Note that the setting of + GatewayPorts may further restrict listen addresses. Note that + ssh(1) will send a hostname of M-bM-^@M-^\localhostM-bM-^@M-^] if a listen host was + not specified when the forwarding was requested, and that this + name is treated differently to the explicit localhost addresses + M-bM-^@M-^\127.0.0.1M-bM-^@M-^] and M-bM-^@M-^\::1M-bM-^@M-^]. + + permitopen="host:port" + Limit local port forwarding with the ssh(1) -L option such that + it may only connect to the specified host and port. IPv6 + addresses can be specified by enclosing the address in square + brackets. Multiple permitopen options may be applied separated + by commas. No pattern matching or name lookup is performed on + the specified hostnames, they must be literal host names and/or + addresses. A port specification of * matches any port. + + port-forwarding + Enable port forwarding previously disabled by the restrict + option. + + principals="principals" + On a cert-authority line, specifies allowed principals for + certificate authentication as a comma-separated list. At least + one name from the list must appear in the certificate's list of + principals for the certificate to be accepted. This option is + ignored for keys that are not marked as trusted certificate + signers using the cert-authority option. + + pty Permits tty allocation previously disabled by the restrict + option. + + no-touch-required + Do not require demonstration of user presence for signatures made + using this key. This option only makes sense for the FIDO + authenticator algorithms ecdsa-sk and ed25519-sk. + + verify-required + Require that signatures made using this key attest that they + verified the user, e.g. via a PIN. This option only makes sense + for the FIDO authenticator algorithms ecdsa-sk and ed25519-sk. + + restrict + Enable all restrictions, i.e. disable port, agent and X11 + forwarding, as well as disabling PTY allocation and execution of + ~/.ssh/rc. If any future restriction capabilities are added to + authorized_keys files, they will be included in this set. + + tunnel="n" + Force a tun(4) device on the server. Without this option, the + next available device will be used if the client requests a + tunnel. + + user-rc + Enables execution of ~/.ssh/rc previously disabled by the + restrict option. + + X11-forwarding + Permits X11 forwarding previously disabled by the restrict + option. + + An example authorized_keys file: + + # Comments are allowed at start of line. Blank lines are allowed. + # Plain key, no restrictions + ssh-rsa ... + # Forced command, disable PTY and all forwarding + restrict,command="dump /home" ssh-rsa ... + # Restriction of ssh -L forwarding destinations + permitopen="192.0.2.1:80",permitopen="192.0.2.2:25" ssh-rsa ... + # Restriction of ssh -R forwarding listeners + permitlisten="localhost:8080",permitlisten="[::1]:22000" ssh-rsa ... + # Configuration for tunnel forwarding + tunnel="0",command="sh /etc/netstart tun0" ssh-rsa ... + # Override of restriction to allow PTY allocation + restrict,pty,command="nethack" ssh-rsa ... + # Allow FIDO key without requiring touch + no-touch-required sk-ecdsa-sha2-nistp256@openssh.com ... + # Require user-verification (e.g. PIN or biometric) for FIDO key + verify-required sk-ecdsa-sha2-nistp256@openssh.com ... + # Trust CA key, allow touch-less FIDO if requested in certificate + cert-authority,no-touch-required,principals="user_a" ssh-rsa ... + +SSH_KNOWN_HOSTS FILE FORMAT + The /etc/ssh/ssh_known_hosts and ~/.ssh/known_hosts files contain host + public keys for all known hosts. The global file should be prepared by + the administrator (optional), and the per-user file is maintained + automatically: whenever the user connects to an unknown host, its key is + added to the per-user file. + + Each line in these files contains the following fields: marker + (optional), hostnames, keytype, base64-encoded key, comment. The fields + are separated by spaces. + + The marker is optional, but if it is present then it must be one of + M-bM-^@M-^\@cert-authorityM-bM-^@M-^], to indicate that the line contains a certification + authority (CA) key, or M-bM-^@M-^\@revokedM-bM-^@M-^], to indicate that the key contained on + the line is revoked and must not ever be accepted. Only one marker + should be used on a key line. + + Hostnames is a comma-separated list of patterns (M-bM-^@M-^X*M-bM-^@M-^Y and M-bM-^@M-^X?M-bM-^@M-^Y act as + wildcards); each pattern in turn is matched against the host name. When + sshd is authenticating a client, such as when using + HostbasedAuthentication, this will be the canonical client host name. + When ssh(1) is authenticating a server, this will be the host name given + by the user, the value of the ssh(1) HostkeyAlias if it was specified, or + the canonical server hostname if the ssh(1) CanonicalizeHostname option + was used. + + A pattern may also be preceded by M-bM-^@M-^X!M-bM-^@M-^Y to indicate negation: if the host + name matches a negated pattern, it is not accepted (by that line) even if + it matched another pattern on the line. A hostname or address may + optionally be enclosed within M-bM-^@M-^X[M-bM-^@M-^Y and M-bM-^@M-^X]M-bM-^@M-^Y brackets then followed by M-bM-^@M-^X:M-bM-^@M-^Y + and a non-standard port number. + + Alternately, hostnames may be stored in a hashed form which hides host + names and addresses should the file's contents be disclosed. Hashed + hostnames start with a M-bM-^@M-^X|M-bM-^@M-^Y character. Only one hashed hostname may + appear on a single line and none of the above negation or wildcard + operators may be applied. + + The keytype and base64-encoded key are taken directly from the host key; + they can be obtained, for example, from /etc/ssh/ssh_host_rsa_key.pub. + The optional comment field continues to the end of the line, and is not + used. + + Lines starting with M-bM-^@M-^X#M-bM-^@M-^Y and empty lines are ignored as comments. + + When performing host authentication, authentication is accepted if any + matching line has the proper key; either one that matches exactly or, if + the server has presented a certificate for authentication, the key of the + certification authority that signed the certificate. For a key to be + trusted as a certification authority, it must use the M-bM-^@M-^\@cert-authorityM-bM-^@M-^] + marker described above. + + The known hosts file also provides a facility to mark keys as revoked, + for example when it is known that the associated private key has been + stolen. Revoked keys are specified by including the M-bM-^@M-^\@revokedM-bM-^@M-^] marker at + the beginning of the key line, and are never accepted for authentication + or as certification authorities, but instead will produce a warning from + ssh(1) when they are encountered. + + It is permissible (but not recommended) to have several lines or + different host keys for the same names. This will inevitably happen when + short forms of host names from different domains are put in the file. It + is possible that the files contain conflicting information; + authentication is accepted if valid information can be found from either + file. + + Note that the lines in these files are typically hundreds of characters + long, and you definitely don't want to type in the host keys by hand. + Rather, generate them by a script, ssh-keyscan(1) or by taking, for + example, /etc/ssh/ssh_host_rsa_key.pub and adding the host names at the + front. ssh-keygen(1) also offers some basic automated editing for + ~/.ssh/known_hosts including removing hosts matching a host name and + converting all host names to their hashed representations. + + An example ssh_known_hosts file: + + # Comments allowed at start of line + cvs.example.net,192.0.2.10 ssh-rsa AAAA1234.....= + # A hashed hostname + |1|JfKTdBh7rNbXkVAQCRp4OQoPfmI=|USECr3SWf1JUPsms5AqfD5QfxkM= ssh-rsa + AAAA1234.....= + # A revoked key + @revoked * ssh-rsa AAAAB5W... + # A CA key, accepted for any host in *.mydomain.com or *.mydomain.org + @cert-authority *.mydomain.org,*.mydomain.com ssh-rsa AAAAB5W... + +FILES + ~/.hushlogin + This file is used to suppress printing the last login time and + /etc/motd, if PrintLastLog and PrintMotd, respectively, are + enabled. It does not suppress printing of the banner specified + by Banner. + + ~/.rhosts + This file is used for host-based authentication (see ssh(1) for + more information). On some machines this file may need to be + world-readable if the user's home directory is on an NFS + partition, because sshd reads it as root. Additionally, this + file must be owned by the user, and must not have write + permissions for anyone else. The recommended permission for most + machines is read/write for the user, and not accessible by + others. + + ~/.shosts + This file is used in exactly the same way as .rhosts, but allows + host-based authentication without permitting login with + rlogin/rsh. + + ~/.ssh/ + This directory is the default location for all user-specific + configuration and authentication information. There is no + general requirement to keep the entire contents of this directory + secret, but the recommended permissions are read/write/execute + for the user, and not accessible by others. + + ~/.ssh/authorized_keys + Lists the public keys (ECDSA, Ed25519, RSA) that can be used for + logging in as this user. The format of this file is described + above. The content of the file is not highly sensitive, but the + recommended permissions are read/write for the user, and not + accessible by others. + + If this file, the ~/.ssh directory, or the user's home directory + are writable by other users, then the file could be modified or + replaced by unauthorized users. In this case, sshd will not + allow it to be used unless the StrictModes option has been set to + M-bM-^@M-^\noM-bM-^@M-^]. + + ~/.ssh/environment + This file is read into the environment at login (if it exists). + It can only contain empty lines, comment lines (that start with + M-bM-^@M-^X#M-bM-^@M-^Y), and assignment lines of the form name=value. The file + should be writable only by the user; it need not be readable by + anyone else. Environment processing is disabled by default and + is controlled via the PermitUserEnvironment option. + + ~/.ssh/known_hosts + Contains a list of host keys for all hosts the user has logged + into that are not already in the systemwide list of known host + keys. The format of this file is described above. This file + should be writable only by root/the owner and can, but need not + be, world-readable. + + ~/.ssh/rc + Contains initialization routines to be run before the user's home + directory becomes accessible. This file should be writable only + by the user, and need not be readable by anyone else. + + /etc/hosts.equiv + This file is for host-based authentication (see ssh(1)). It + should only be writable by root. + + /etc/moduli + Contains Diffie-Hellman groups used for the "Diffie-Hellman Group + Exchange" key exchange method. The file format is described in + moduli(5). If no usable groups are found in this file then fixed + internal groups will be used. + + /etc/motd + See motd(5). + + /etc/nologin + If this file exists, sshd refuses to let anyone except root log + in. The contents of the file are displayed to anyone trying to + log in, and non-root connections are refused. The file should be + world-readable. + + /etc/shosts.equiv + This file is used in exactly the same way as hosts.equiv, but + allows host-based authentication without permitting login with + rlogin/rsh. + + /etc/ssh/ssh_host_ecdsa_key + /etc/ssh/ssh_host_ed25519_key + /etc/ssh/ssh_host_mldsa44_ed25519_key + /etc/ssh/ssh_host_rsa_key + These files contain the private parts of the host keys. These + files should only be owned by root, readable only by root, and + not accessible to others. Note that sshd does not start if these + files are group/world-accessible. + + /etc/ssh/ssh_host_ecdsa_key.pub + /etc/ssh/ssh_host_ed25519_key.pub + /etc/ssh/ssh_host_mldsa44_ed25519_key.pub + /etc/ssh/ssh_host_rsa_key.pub + These files contain the public parts of the host keys. These + files should be world-readable but writable only by root. Their + contents should match the respective private parts. These files + are not really used for anything; they are provided for the + convenience of the user so their contents can be copied to known + hosts files. These files are created using ssh-keygen(1). + + /etc/ssh/ssh_known_hosts + Systemwide list of known host keys. This file should be prepared + by the system administrator to contain the public host keys of + all machines in the organization. The format of this file is + described above. This file should be writable only by root/the + owner and should be world-readable. + + /etc/ssh/sshd_config + Contains configuration data for sshd. The file format and + configuration options are described in sshd_config(5). + + /etc/ssh/sshrc + Similar to ~/.ssh/rc, it can be used to specify machine-specific + login-time initializations globally. This file should be + writable only by root, and should be world-readable. + + /var/empty + chroot(2) directory used by sshd during privilege separation in + the pre-authentication phase. The directory should not contain + any files and must be owned by root and not group or world- + writable. + + /var/run/sshd.pid + Contains the process ID of the sshd listening for connections (if + there are several daemons running concurrently for different + ports, this contains the process ID of the one started last). + The content of this file is not sensitive; it can be world- + readable. + +SEE ALSO + scp(1), sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), + ssh-keyscan(1), chroot(2), login.conf(5), moduli(5), sshd_config(5), + inetd(8), sftp-server(8) + +AUTHORS + OpenSSH is a derivative of the original and free ssh 1.2.12 release by + Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo + de Raadt and Dug Song removed many bugs, re-added newer features and + created OpenSSH. Markus Friedl contributed the support for SSH protocol + versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support + for privilege separation. + +OpenBSD 8.0 July 11, 2026 SSHD(8) diff --git a/sshd_config b/sshd_config index 1ceafad10e44..3be12f2156d3 100644 --- a/sshd_config +++ b/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.105 2024/12/03 14:12:47 dtucker Exp $ +# $OpenBSD: sshd_config,v 1.106 2026/07/10 17:21:19 naddy Exp $ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -18,6 +18,7 @@ Port 2222 #HostKey /etc/hpnssh/ssh_host_rsa_key #HostKey /etc/hpnssh/ssh_host_ecdsa_key #HostKey /etc/hpnssh/ssh_host_ed25519_key +#HostKey /etc/hpnssh/ssh_host_mldsa44_ed25519_key # Ciphers and keying #RekeyLimit default none diff --git a/sshd_config.0 b/sshd_config.0 new file mode 100644 index 000000000000..2248006ea659 --- /dev/null +++ b/sshd_config.0 @@ -0,0 +1,1469 @@ +SSHD_CONFIG(5) File Formats Manual SSHD_CONFIG(5) + +NAME + sshd_config M-bM-^@M-^S OpenSSH daemon configuration file + +DESCRIPTION + sshd(8) reads configuration data from /etc/ssh/sshd_config (or the file + specified with -f on the command line). The file contains keyword- + argument pairs, one per line. Unless noted otherwise, for each keyword, + the first obtained value will be used. Lines starting with M-bM-^@M-^X#M-bM-^@M-^Y and empty + lines are interpreted as comments. Arguments may optionally be enclosed + in double quotes (") in order to represent arguments containing spaces. + + The possible keywords and their meanings are as follows (note that + keywords are case-insensitive and arguments are case-sensitive): + + AcceptEnv + Specifies what environment variables sent by the client will be + copied into the session's environ(7). See SendEnv and SetEnv in + ssh_config(5) for how to configure the client. The TERM + environment variable is always accepted whenever the client + requests a pseudo-terminal as it is required by the protocol. + Variables are specified by name, which may contain the wildcard + characters M-bM-^@M-^X*M-bM-^@M-^Y and M-bM-^@M-^X?M-bM-^@M-^Y. Multiple environment variables may be + separated by whitespace or spread across multiple AcceptEnv + directives. Be warned that some environment variables could be + used to bypass restricted user environments. For this reason, + care should be taken in the use of this directive. The default + is not to accept any environment variables. + + AddressFamily + Specifies which address family should be used by sshd(8). Valid + arguments are any (the default), inet (use IPv4 only), or inet6 + (use IPv6 only). + + AllowAgentForwarding + Specifies whether ssh-agent(1) forwarding is permitted. The + default is yes. Note that disabling agent forwarding does not + improve security unless users are also denied shell access, as + they can always install their own forwarders. + + AllowGroups + This keyword can be followed by a list of group name patterns, + separated by spaces. If specified, login is allowed only for + users whose primary group or supplementary group list matches one + of the patterns. Only group names are valid; a numerical group + ID is not recognized. By default, login is allowed for all + groups. AllowGroups is not consulted for groups matched by + DenyGroups. + + See PATTERNS in ssh_config(5) for more information on patterns. + This keyword may appear multiple times in sshd_config with each + instance appending to the list. + + AllowStreamLocalForwarding + Specifies whether StreamLocal (Unix-domain socket) forwarding is + permitted. The available options are yes (the default) or all to + allow StreamLocal forwarding, no to prevent all StreamLocal + forwarding, local to allow local (from the perspective of ssh(1)) + forwarding only or remote to allow remote forwarding only. Note + that disabling StreamLocal forwarding does not improve security + unless users are also denied shell access, as they can always + install their own forwarders. + + AllowTcpForwarding + Specifies whether TCP forwarding is permitted. The available + options are yes (the default) or all to allow TCP forwarding, no + to prevent all TCP forwarding, local to allow local (from the + perspective of ssh(1)) forwarding only or remote to allow remote + forwarding only. Note that disabling TCP forwarding does not + improve security unless users are also denied shell access, as + they can always install their own forwarders. + + AllowUsers + This keyword can be followed by a list of user name patterns, + separated by spaces. If specified, login is allowed only for + user names that match one of the patterns. Only user names are + valid; a numerical user ID is not recognized. By default, login + is allowed for all users. If the pattern takes the form + USER@HOST then USER and HOST are separately checked, restricting + logins to particular users from particular hosts. HOST criteria + may additionally contain addresses to match in CIDR + address/masklen format. AllowUsers is not consulted for users + matched by DenyUsers. + + See PATTERNS in ssh_config(5) for more information on patterns. + This keyword may appear multiple times in sshd_config with each + instance appending to the list. + + AuthenticationMethods + Specifies the authentication methods that must be successfully + completed for a user to be granted access. This option must be + followed by one or more lists of comma-separated authentication + method names, or by the single string any to indicate the default + behaviour of accepting any single authentication method. If the + default is overridden, then successful authentication requires + completion of every method in at least one of these lists. + + For example, "publickey,password publickey,keyboard-interactive" + would require the user to complete public key authentication, + followed by either password or keyboard interactive + authentication. Only methods that are next in one or more lists + are offered at each stage, so for this example it would not be + possible to attempt password or keyboard-interactive + authentication before public key. + + For keyboard interactive authentication it is also possible to + restrict authentication to a specific device by appending a colon + followed by the device identifier bsdauth or pam. depending on + the server configuration. For example, + "keyboard-interactive:bsdauth" would restrict keyboard + interactive authentication to the bsdauth device. + + If the publickey method is listed more than once, sshd(8) + verifies that keys that have been used successfully are not + reused for subsequent authentications. For example, + "publickey,publickey" requires successful authentication using + two different public keys. + + Note that each authentication method listed should also be + explicitly enabled in the configuration. + + The available authentication methods are: "gssapi-with-mic", + "hostbased", "keyboard-interactive", "none" (used for access to + password-less accounts when PermitEmptyPasswords is enabled), + "password" and "publickey". + + AuthorizedKeysCommand + Specifies a program to be used to look up the user's public keys. + The program must be owned by root, not writable by group or + others and specified by an absolute path. Arguments to + AuthorizedKeysCommand accept the tokens described in the TOKENS + section. If no arguments are specified then the username of the + target user is used. + + The program should produce on standard output zero or more lines + of authorized_keys output (see AUTHORIZED_KEYS in sshd(8)). + AuthorizedKeysCommand is tried after the usual AuthorizedKeysFile + files and will not be executed if a matching key is found there. + By default, no AuthorizedKeysCommand is run. This command is + only executed for valid users. + + AuthorizedKeysCommandUser + Specifies the user under whose account the AuthorizedKeysCommand + is run. It is recommended to use a dedicated user that has no + other role on the host than running authorized keys commands. If + AuthorizedKeysCommand is specified but AuthorizedKeysCommandUser + is not, then sshd(8) will refuse to start. + + AuthorizedKeysFile + Specifies the file that contains the public keys used for user + authentication. The format is described in the AUTHORIZED_KEYS + FILE FORMAT section of sshd(8). Arguments to AuthorizedKeysFile + may include wildcards and accept the tokens described in the + TOKENS section. After expansion, AuthorizedKeysFile is taken to + be an absolute path or one relative to the user's home directory. + Multiple files may be listed, separated by whitespace. + Alternately this option may be set to none to skip checking for + user keys in files. The default is ".ssh/authorized_keys + .ssh/authorized_keys2". These files are only checked for valid + users. + + AuthorizedPrincipalsCommand + Specifies a program to be used to generate the list of allowed + certificate principals as per AuthorizedPrincipalsFile. The + program must be owned by root, not writable by group or others + and specified by an absolute path. Arguments to + AuthorizedPrincipalsCommand accept the tokens described in the + TOKENS section. If no arguments are specified then the username + of the target user is used. + + The program should produce on standard output zero or more lines + of AuthorizedPrincipalsFile output. If either + AuthorizedPrincipalsCommand or AuthorizedPrincipalsFile is + specified, then certificates offered by the client for + authentication must contain a principal that is listed. By + default, no AuthorizedPrincipalsCommand is run. This command is + only executed for valid users. + + AuthorizedPrincipalsCommandUser + Specifies the user under whose account the + AuthorizedPrincipalsCommand is run. It is recommended to use a + dedicated user that has no other role on the host than running + authorized principals commands. If AuthorizedPrincipalsCommand + is specified but AuthorizedPrincipalsCommandUser is not, then + sshd(8) will refuse to start. + + AuthorizedPrincipalsFile + Specifies a file that lists principal names that are accepted for + certificate authentication. When using certificates signed by a + key listed in TrustedUserCAKeys, this file lists names, one of + which must appear in the certificate for it to be accepted for + authentication. Names are listed one per line preceded by key + options (as described in AUTHORIZED_KEYS FILE FORMAT in sshd(8)). + Empty lines and comments starting with M-bM-^@M-^X#M-bM-^@M-^Y are ignored. + + Arguments to AuthorizedPrincipalsFile may include wildcards and + accept the tokens described in the TOKENS section. After + expansion, AuthorizedPrincipalsFile is taken to be an absolute + path or one relative to the user's home directory. The default + is none, i.e. not to use a principals file M-bM-^@M-^S in this case, the + username of the user must appear in a certificate's principals + list for it to be accepted. This file is only checked for valid + users. + + Note that AuthorizedPrincipalsFile is only used when + authentication proceeds using a CA listed in TrustedUserCAKeys + and is not consulted for certification authorities trusted via + ~/.ssh/authorized_keys, though the principals= key option offers + a similar facility (see sshd(8) for details). + + Banner The contents of the specified file are sent to the remote user + before authentication is allowed. If the argument is none then + no banner is displayed. By default, no banner is displayed. + + CASignatureAlgorithms + Specifies which algorithms are allowed for signing of + certificates by certificate authorities (CAs). The default is: + + ssh-ed25519,ecdsa-sha2-nistp256, + ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, + sk-ssh-ed25519@openssh.com, + sk-ecdsa-sha2-nistp256@openssh.com, + rsa-sha2-512,rsa-sha2-256, + ssh-mldsa44-ed25519@openssh.com + + If the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the + specified algorithms will be appended to the default set instead + of replacing them. If the specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y + character, then the specified algorithms (including wildcards) + will be removed from the default set instead of replacing them. + + Certificates signed using other algorithms will not be accepted + for public key or host-based authentication. + + ChannelTimeout + Specifies whether and how quickly sshd(8) should close inactive + channels. Timeouts are specified as one or more M-bM-^@M-^\type=intervalM-bM-^@M-^] + pairs separated by whitespace, where the M-bM-^@M-^\typeM-bM-^@M-^] must be the + special keyword M-bM-^@M-^\globalM-bM-^@M-^] or a channel type name from the list + below, optionally containing wildcard characters. + + The timeout value M-bM-^@M-^\intervalM-bM-^@M-^] is specified in seconds or may use + any of the units documented in the TIME FORMATS section. For + example, M-bM-^@M-^\session=5mM-bM-^@M-^] would cause interactive sessions to + terminate after five minutes of inactivity. Specifying a zero + value disables the inactivity timeout. + + The special timeout M-bM-^@M-^\globalM-bM-^@M-^] applies to all active channels, + taken together. Traffic on any active channel will reset the + timeout, but when the timeout expires then all open channels will + be closed. Note that this global timeout is not matched by + wildcards and must be specified explicitly. + + The available channel type names include: + + agent-connection + Open connections to ssh-agent(1). + + direct-tcpip, direct-streamlocal@openssh.com + Open TCP or Unix socket (respectively) connections that + have been established from an ssh(1) local forwarding, + i.e. LocalForward or DynamicForward. + + forwarded-tcpip, forwarded-streamlocal@openssh.com + Open TCP or Unix socket (respectively) connections that + have been established to an sshd(8) listening on behalf + of an ssh(1) remote forwarding, i.e. RemoteForward. + + session + The interactive main session, including shell session, + command execution, scp(1), sftp(1), etc. + + tun-connection + Open TunnelForward connections. + + x11-connection + Open X11 forwarding sessions. + + Note that in all the above cases, terminating an inactive session + does not guarantee to remove all resources associated with the + session, e.g. shell processes or X11 clients relating to the + session may continue to execute. + + Moreover, terminating an inactive channel or session does not + necessarily close the SSH connection, nor does it prevent a + client from requesting another channel of the same type. In + particular, expiring an inactive forwarding session does not + prevent another identical forwarding from being subsequently + created. + + The default is not to expire channels of any type for inactivity. + + ChrootDirectory + Specifies the pathname of a directory to chroot(2) to after + authentication. At session startup sshd(8) checks that all + components of the pathname are root-owned directories which are + not writable by group or others. After the chroot, sshd(8) + changes the working directory to the user's home directory. + Arguments to ChrootDirectory accept the tokens described in the + TOKENS section. + + The ChrootDirectory must contain the necessary files and + directories to support the user's session. For an interactive + session this requires at least a shell, typically sh(1), and + basic /dev nodes such as null(4), zero(4), stdin(4), stdout(4), + stderr(4), and tty(4) devices. For file transfer sessions using + SFTP no additional configuration of the environment is necessary + if the in-process sftp-server is used, though sessions which use + logging may require /dev/log inside the chroot directory on some + operating systems (see sftp-server(8) for details). + + For safety, it is very important that the directory hierarchy be + prevented from modification by other processes on the system + (especially those outside the jail). Misconfiguration can lead + to unsafe environments which sshd(8) cannot detect. + + The default is none, indicating not to chroot(2). + + Ciphers + Specifies the ciphers allowed. Multiple ciphers must be comma- + separated. If the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, + then the specified ciphers will be appended to the default set + instead of replacing them. If the specified list begins with a + M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified ciphers (including wildcards) + will be removed from the default set instead of replacing them. + If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the + specified ciphers will be placed at the head of the default set. + + The supported ciphers are: + + 3des-cbc + aes128-cbc + aes192-cbc + aes256-cbc + aes128-ctr + aes192-ctr + aes256-ctr + aes128-gcm@openssh.com + aes256-gcm@openssh.com + chacha20-poly1305@openssh.com + + The default is: + + chacha20-poly1305@openssh.com, + aes128-gcm@openssh.com,aes256-gcm@openssh.com, + aes128-ctr,aes192-ctr,aes256-ctr + + The list of available ciphers may also be obtained using "ssh -Q + cipher". + + ClientAliveCountMax + Sets the number of client alive messages which may be sent + without sshd(8) receiving any messages back from the client. If + this threshold is reached while client alive messages are being + sent, sshd will disconnect the client, terminating the session. + It is important to note that the use of client alive messages is + very different from TCPKeepAlive. The client alive messages are + sent through the encrypted channel and therefore will not be + spoofable. The TCP keepalive option enabled by TCPKeepAlive is + spoofable. The client alive mechanism is valuable when the + client or server depend on knowing when a connection has become + unresponsive. + + The default value is 3. If ClientAliveInterval is set to 15, and + ClientAliveCountMax is left at the default, unresponsive SSH + clients will be disconnected after approximately 45 seconds. + Setting a zero ClientAliveCountMax disables connection + termination. + + ClientAliveInterval + Sets a timeout interval in seconds after which if no data has + been received from the client, sshd(8) will send a message + through the encrypted channel to request a response from the + client. The default is 0, indicating that these messages will + not be sent to the client. + + Compression + Specifies whether compression is enabled after the user has + authenticated successfully. The argument must be yes, delayed (a + legacy synonym for yes) or no. The default is yes. + + Compression applies to all traffic that flows over the SSH + connection. If untrusted traffic (such as an open port-forward) + is permitted over the connection alongside trusted traffic, then + compression may leak information about session contents. For + this reason, it is not recommended to enable compression for + connections that share trusted and untrusted traffic. + + DenyGroups + This keyword can be followed by a list of group name patterns, + separated by spaces. Login is disallowed for users whose primary + group or supplementary group list matches one of the patterns. + Only group names are valid; a numerical group ID is not + recognized. By default, login is allowed for all groups. + AllowGroups is not consulted for groups matched by DenyGroups. + + See PATTERNS in ssh_config(5) for more information on patterns. + This keyword may appear multiple times in sshd_config with each + instance appending to the list. + + DenyUsers + This keyword can be followed by a list of user name patterns, + separated by spaces. Login is disallowed for user names that + match one of the patterns. Only user names are valid; a + numerical user ID is not recognized. By default, login is + allowed for all users. If the pattern takes the form USER@HOST + then USER and HOST are separately checked, restricting logins to + particular users from particular hosts. HOST criteria may + additionally contain addresses to match in CIDR address/masklen + format. AllowUsers is not consulted for users matched by + DenyUsers. + + See PATTERNS in ssh_config(5) for more information on patterns. + This keyword may appear multiple times in sshd_config with each + instance appending to the list. + + DisableForwarding + Disables all forwarding features, including X11, ssh-agent(1), + TCP and StreamLocal. This option overrides all other forwarding- + related options and may simplify restricted configurations. + + ExposeAuthInfo + Writes a temporary file containing a list of authentication + methods and public credentials (e.g. keys) used to authenticate + the user. The location of the file is exposed to the user + session through the SSH_USER_AUTH environment variable. The + default is no. + + FingerprintHash + Specifies the hash algorithm used when logging key fingerprints. + Valid options are: md5 and sha256. The default is sha256. + + ForceCommand + Forces the execution of the command specified by ForceCommand, + ignoring any command supplied by the client and ~/.ssh/rc if + present. The command is invoked by using the user's login shell + with the -c option. This applies to shell, command, or subsystem + execution. It is most useful inside a Match block. The command + originally supplied by the client is available in the + SSH_ORIGINAL_COMMAND environment variable. Specifying a command + of internal-sftp will force the use of an in-process SFTP server + that requires no support files when used with ChrootDirectory. + The default is none. + + This directive does not limit other kinds of access that a client + may request via their connection, such as TCP, agent, socket or + X11 forwarding. If these are not desired, then they must be + explicitly disabled, either individually via their respective + options or all together using the DisableForwarding option. + + GatewayPorts + Specifies whether remote hosts are allowed to connect to ports + forwarded for the client. By default, sshd(8) binds remote port + forwardings to the loopback address. This prevents other remote + hosts from connecting to forwarded ports. GatewayPorts can be + used to specify that sshd should allow remote port forwardings to + bind to non-loopback addresses, thus allowing other hosts to + connect. The argument may be no to force remote port forwardings + to be available to the local host only, yes to force remote port + forwardings to bind to the wildcard address, or clientspecified + to allow the client to select the address to which the forwarding + is bound. The default is no. + + GSSAPIAuthentication + Specifies whether user authentication based on GSSAPI is allowed. + The default is no. + + GSSAPICleanupCredentials + Specifies whether to automatically destroy the user's credentials + cache on logout. The default is yes. + + GSSAPIDelegateCredentials + Accept delegated credentials on the server side. The default is + yes. + + GSSAPIStrictAcceptorCheck + Determines whether to be strict about the identity of the GSSAPI + acceptor a client authenticates against. If set to yes then the + client must authenticate against the host service on the current + hostname. If set to no then the client may authenticate against + any service key stored in the machine's default store. This + facility is provided to assist with operation on multi homed + machines. The default is yes. This option may not be effective + in Windows Active Directory environments. + + HostbasedAcceptedAlgorithms + Specifies the signature algorithms that will be accepted for + hostbased authentication as a list of comma-separated patterns. + Alternately if the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, + then the specified signature algorithms will be appended to the + default set instead of replacing them. If the specified list + begins with a M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified signature + algorithms (including wildcards) will be removed from the default + set instead of replacing them. If the specified list begins with + a M-bM-^@M-^X^M-bM-^@M-^Y character, then the specified signature algorithms will be + placed at the head of the default set. The default for this + option is: + + ssh-ed25519-cert-v01@openssh.com, + ecdsa-sha2-nistp256-cert-v01@openssh.com, + ecdsa-sha2-nistp384-cert-v01@openssh.com, + ecdsa-sha2-nistp521-cert-v01@openssh.com, + sk-ssh-ed25519-cert-v01@openssh.com, + sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + rsa-sha2-512-cert-v01@openssh.com, + rsa-sha2-256-cert-v01@openssh.com, + ssh-mldsa44-ed25519-cert-v01@openssh.com, + ssh-ed25519, + ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, + sk-ssh-ed25519@openssh.com, + sk-ecdsa-sha2-nistp256@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256@openssh.com, + rsa-sha2-512,rsa-sha2-256, + ssh-mldsa44-ed25519@openssh.com + + The list of available signature algorithms may also be obtained + using "ssh -Q HostbasedAcceptedAlgorithms". This was formerly + named HostbasedAcceptedKeyTypes. + + HostbasedAuthentication + Specifies whether rhosts or /etc/hosts.equiv authentication + together with successful public key client host authentication is + allowed (host-based authentication). The default is no. + + HostbasedUsesNameFromPacketOnly + Specifies whether or not the server will attempt to perform a + reverse name lookup when matching the name in the ~/.shosts, + ~/.rhosts, and /etc/hosts.equiv files during + HostbasedAuthentication. A setting of yes means that sshd(8) + uses the name supplied by the client rather than attempting to + resolve the name from the TCP connection itself. The default is + no. + + HostCertificate + Specifies a file containing a public host certificate. The + certificate's public key must match a private host key already + specified by HostKey. The default behaviour of sshd(8) is not to + load any certificates. + + HostKey + Specifies a file containing a private host key used by SSH. The + defaults are /etc/ssh/ssh_host_ecdsa_key, + /etc/ssh/ssh_host_ed25519_key, + /etc/ssh/ssh_host_mldsa44_ed25519_key and + /etc/ssh/ssh_host_rsa_key. + + Note that sshd(8) will refuse to use a file if it is group/world- + accessible and that the HostKeyAlgorithms option restricts which + of the keys are actually used by sshd(8). + + It is possible to have multiple host key files. It is also + possible to specify public host key files instead. In this case + operations on the private key will be delegated to an + ssh-agent(1). + + HostKeyAgent + Identifies the UNIX-domain socket used to communicate with an + agent that has access to the private host keys. If the string + "SSH_AUTH_SOCK" is specified, the location of the socket will be + read from the SSH_AUTH_SOCK environment variable. + + HostKeyAlgorithms + Specifies the host key signature algorithms that the server + offers. The default for this option is: + + ssh-ed25519-cert-v01@openssh.com, + ecdsa-sha2-nistp256-cert-v01@openssh.com, + ecdsa-sha2-nistp384-cert-v01@openssh.com, + ecdsa-sha2-nistp521-cert-v01@openssh.com, + sk-ssh-ed25519-cert-v01@openssh.com, + sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + rsa-sha2-512-cert-v01@openssh.com, + rsa-sha2-256-cert-v01@openssh.com, + ssh-mldsa44-ed25519-cert-v01@openssh.com, + ssh-ed25519, + ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, + sk-ssh-ed25519@openssh.com, + sk-ecdsa-sha2-nistp256@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256@openssh.com, + rsa-sha2-512,rsa-sha2-256, + ssh-mldsa44-ed25519@openssh.com + + The list of available signature algorithms may also be obtained + using "ssh -Q HostKeyAlgorithms". + + IgnoreRhosts + Specifies whether to ignore per-user .rhosts and .shosts files + during HostbasedAuthentication. The system-wide /etc/hosts.equiv + and /etc/shosts.equiv are still used regardless of this setting. + + Accepted values are yes (the default) to ignore all per-user + files, shosts-only to allow the use of .shosts but to ignore + .rhosts or no to allow both .shosts and rhosts. + + IgnoreUserKnownHosts + Specifies whether sshd(8) should ignore the user's + ~/.ssh/known_hosts during HostbasedAuthentication and use only + the system-wide known hosts file /etc/ssh/ssh_known_hosts. The + default is M-bM-^@M-^\noM-bM-^@M-^]. + + Include + Include the specified configuration file(s). Multiple pathnames + may be specified and each pathname may contain glob(7) wildcards + that will be expanded and processed in lexical order. Files + without absolute paths are assumed to be in /etc/ssh. An Include + directive may appear inside a Match block to perform conditional + inclusion. + + IPQoS Specifies the Differentiated Services Field Codepoint (DSCP) + value for the connection. Accepted values are af11, af12, af13, + af21, af22, af23, af31, af32, af33, af41, af42, af43, cs0, cs1, + cs2, cs3, cs4, cs5, cs6, cs7, ef, le, a numeric value, or none to + use the operating system default. This option may take one or + two arguments, separated by whitespace. If one argument is + specified, it is used as the packet class unconditionally. If + two values are specified, the first is automatically selected for + interactive sessions and the second for non-interactive sessions. + The default is ef (Expedited Forwarding) for interactive sessions + and none (the operating system default) for non-interactive + sessions. + + KbdInteractiveAuthentication + Specifies whether to allow keyboard-interactive authentication. + All authentication styles from login.conf(5) are supported. The + default is yes. The argument to this keyword must be yes or no. + ChallengeResponseAuthentication is a deprecated alias for this. + + KerberosAuthentication + Specifies whether the password provided by the user for + PasswordAuthentication will be validated through the Kerberos + KDC. To use this option, the server needs a Kerberos servtab + which allows the verification of the KDC's identity. The default + is no. + + KerberosGetAFSToken + If AFS is active and the user has a Kerberos 5 TGT, attempt to + acquire an AFS token before accessing the user's home directory. + The default is no. + + KerberosOrLocalPasswd + If password authentication through Kerberos fails then the + password will be validated via any additional local mechanism + such as /etc/passwd. The default is yes. + + KerberosTicketCleanup + Specifies whether to automatically destroy the user's ticket + cache file on logout. The default is yes. + + KexAlgorithms + Specifies the permitted KEX (Key Exchange) algorithms that the + server will offer to clients. The ordering of this list is not + important, as the client specifies the preference order. + Multiple algorithms must be comma-separated. + + If the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the + specified algorithms will be appended to the default set instead + of replacing them. If the specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y + character, then the specified algorithms (including wildcards) + will be removed from the default set instead of replacing them. + If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the + specified algorithms will be placed at the head of the default + set. + + The supported algorithms are: + + curve25519-sha256 + curve25519-sha256@libssh.org + diffie-hellman-group1-sha1 + diffie-hellman-group14-sha1 + diffie-hellman-group14-sha256 + diffie-hellman-group16-sha512 + diffie-hellman-group18-sha512 + diffie-hellman-group-exchange-sha1 + diffie-hellman-group-exchange-sha256 + ecdh-sha2-nistp256 + ecdh-sha2-nistp384 + ecdh-sha2-nistp521 + mlkem768nistp256-sha256 + mlkem768x25519-sha256 + sntrup761x25519-sha512 + sntrup761x25519-sha512@openssh.com + + The default is: + + mlkem768x25519-sha256, + sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com, + curve25519-sha256,curve25519-sha256@libssh.org, + ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521 + + The list of supported key exchange algorithms may also be + obtained using "ssh -Q KexAlgorithms". + + ListenAddress + Specifies the local addresses sshd(8) should listen on. The + following forms may be used: + + ListenAddress hostname|address [rdomain domain] + ListenAddress hostname:port [rdomain domain] + ListenAddress IPv4_address:port [rdomain domain] + ListenAddress [hostname|address]:port [rdomain domain] + + The optional rdomain qualifier requests sshd(8) listen in an + explicit routing domain. If port is not specified, sshd will + listen on the address and all Port options specified. The + default is to listen on all local addresses on the current + default routing domain. Multiple ListenAddress options are + permitted. For more information on routing domains, see + rdomain(4). + + LoginGraceTime + The server disconnects after this time if the user has not + successfully logged in. If the value is 0, there is no time + limit. The default is 120 seconds. + + LogLevel + Gives the verbosity level that is used when logging messages from + sshd(8). The possible values are: QUIET, FATAL, ERROR, INFO, + VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3. The default is INFO. + DEBUG and DEBUG1 are equivalent. DEBUG2 and DEBUG3 each specify + higher levels of debugging output. Logging with a DEBUG level + violates the privacy of users and is not recommended. + + LogVerbose + Specify one or more overrides to LogLevel. An override consists + of one or more pattern lists that matches the source file, + function and line number to force detailed logging for. For + example, an override pattern of: + + kex.c:*:1000,*:kex_exchange_identification():*,packet.c:* + + would enable detailed logging for line 1000 of kex.c, everything + in the kex_exchange_identification() function, and all code in + the packet.c file. This option is intended for debugging and no + overrides are enabled by default. + + MACs Specifies the available MAC (message authentication code) + algorithms. The MAC algorithm is used for data integrity + protection. Multiple algorithms must be comma-separated. If the + specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the specified + algorithms will be appended to the default set instead of + replacing them. If the specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y + character, then the specified algorithms (including wildcards) + will be removed from the default set instead of replacing them. + If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the + specified algorithms will be placed at the head of the default + set. + + The algorithms that contain "-etm" calculate the MAC after + encryption (encrypt-then-mac). These are considered safer and + their use recommended. The supported MACs are: + + hmac-md5 + hmac-md5-96 + hmac-sha1 + hmac-sha1-96 + hmac-sha2-256 + hmac-sha2-512 + umac-64@openssh.com + umac-128@openssh.com + hmac-md5-etm@openssh.com + hmac-md5-96-etm@openssh.com + hmac-sha1-etm@openssh.com + hmac-sha1-96-etm@openssh.com + hmac-sha2-256-etm@openssh.com + hmac-sha2-512-etm@openssh.com + umac-64-etm@openssh.com + umac-128-etm@openssh.com + + The default is: + + umac-64-etm@openssh.com,umac-128-etm@openssh.com, + hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com, + hmac-sha1-etm@openssh.com, + umac-64@openssh.com,umac-128@openssh.com, + hmac-sha2-256,hmac-sha2-512,hmac-sha1 + + The list of available MAC algorithms may also be obtained using + "ssh -Q mac". + + Match Introduces a conditional block. If all of the criteria on the + Match line are satisfied, the keywords on the following lines + override those set in the global section of the config file, + until either another Match line or the end of the file. If a + keyword appears in multiple Match blocks that are satisfied, only + the first instance of the keyword is applied. + + The arguments to Match are one or more criteria-pattern pairs or + one of the single token criteria: All, which matches all + criteria, or Invalid-User, which matches when the requested user- + name does not match any known account. The available criteria + are User, Group, Host, LocalAddress, LocalPort, Version, RDomain, + and Address (with RDomain representing the rdomain(4) on which + the connection was received). + + The match patterns may consist of single entries or comma- + separated lists and may use the wildcard and negation operators + described in the PATTERNS section of ssh_config(5). + + The patterns in an Address criteria may additionally contain + addresses to match in CIDR address/masklen format, such as + 192.0.2.0/24 or 2001:db8::/32. Note that the mask length + provided must be consistent with the address - it is an error to + specify a mask length that is too long for the address or one + with bits set in this host portion of the address. For example, + 192.0.2.0/33 and 192.0.2.0/8, respectively. + + The Version keyword matches against the version string of + sshd(8), for example M-bM-^@M-^\OpenSSH_10.0M-bM-^@M-^]. + + Only a subset of keywords may be used on the lines following a + Match keyword. Available keywords are AcceptEnv, + AllowAgentForwarding, AllowGroups, AllowStreamLocalForwarding, + AllowTcpForwarding, AllowUsers, AuthenticationMethods, + AuthorizedKeysCommand, AuthorizedKeysCommandUser, + AuthorizedKeysFile, AuthorizedPrincipalsCommand, + AuthorizedPrincipalsCommandUser, AuthorizedPrincipalsFile, + Banner, CASignatureAlgorithms, ChannelTimeout, ChrootDirectory, + ClientAliveCountMax, ClientAliveInterval, DenyGroups, DenyUsers, + DisableForwarding, ExposeAuthInfo, ForceCommand, GatewayPorts, + GSSAPIAuthentication, HostbasedAcceptedAlgorithms, + HostbasedAuthentication, HostbasedUsesNameFromPacketOnly, + IgnoreRhosts, Include, IPQoS, KbdInteractiveAuthentication, + KerberosAuthentication, LogLevel, MaxAuthTries, MaxSessions, + PAMServiceName, PasswordAuthentication, PermitEmptyPasswords, + PermitListen, PermitOpen, PermitRootLogin, PermitTTY, + PermitTunnel, PermitUserRC, PubkeyAcceptedAlgorithms, + PubkeyAuthentication, PubkeyAuthOptions, RefuseConnection, + RekeyLimit, RevokedKeys, RDomain, SetEnv, StreamLocalBindMask, + StreamLocalBindUnlink, TrustedUserCAKeys, + UnusedConnectionTimeout, X11DisplayOffset, X11Forwarding and + X11UseLocalhost. + + MaxAuthTries + Specifies the maximum number of authentication attempts permitted + per connection. Once the number of failures reaches half this + value, additional failures are logged. The default is 6. + + MaxSessions + Specifies the maximum number of open shell, login or subsystem + (e.g. sftp) sessions permitted per network connection. Multiple + sessions may be established by clients that support connection + multiplexing. Setting MaxSessions to 1 will effectively disable + session multiplexing, whereas setting it to 0 will prevent all + shell, login and subsystem sessions while still permitting + forwarding. The default is 10. + + MaxStartups + Specifies the maximum number of concurrent unauthenticated + connections to the SSH daemon. Additional connections will be + dropped until authentication succeeds or the LoginGraceTime + expires for a connection. + + Alternatively, random early drop can be enabled by specifying the + three colon separated values start:rate:full (e.g. "10:30:60"). + The default is 10:30:100. sshd(8) will refuse connection + attempts with a probability of rate/100 (30%) if there are + currently start (10) unauthenticated connections. The + probability increases linearly and all connection attempts are + refused if the number of unauthenticated connections reaches full + (60). + + ModuliFile + Specifies the moduli(5) file that contains the Diffie-Hellman + groups used for the M-bM-^@M-^\diffie-hellman-group-exchange-sha1M-bM-^@M-^] and + M-bM-^@M-^\diffie-hellman-group-exchange-sha256M-bM-^@M-^] key exchange methods. The + default is /etc/moduli. + + PAMServiceName + Specifies the service name used for Pluggable Authentication + Modules (PAM) authentication, authorisation and session controls + when UsePAM is enabled. The default is sshd. + + PasswordAuthentication + Specifies whether password authentication is allowed. The + default is yes. + + PermitEmptyPasswords + When password authentication is allowed, it specifies whether the + server allows login to accounts with empty password strings. The + default is no. + + PermitListen + Specifies the addresses/ports on which a remote TCP port + forwarding may listen. The listen specification must be one of + the following forms: + + PermitListen port + PermitListen host:port + + Multiple permissions may be specified by separating them with + whitespace. An argument of any can be used to remove all + restrictions and permit any listen requests. An argument of none + can be used to prohibit all listen requests. The host name may + contain wildcards as described in the PATTERNS section in + ssh_config(5). The wildcard M-bM-^@M-^X*M-bM-^@M-^Y can also be used in place of a + port number to allow all ports. By default all port forwarding + listen requests are permitted. Note that the GatewayPorts option + may further restrict which addresses may be listened on. Note + also that ssh(1) will request a listen host of M-bM-^@M-^\localhostM-bM-^@M-^] if no + listen host was specifically requested, and this name is treated + differently to explicit localhost addresses of M-bM-^@M-^\127.0.0.1M-bM-^@M-^] and + M-bM-^@M-^\::1M-bM-^@M-^]. + + PermitOpen + Specifies the destinations to which TCP port forwarding is + permitted. The forwarding specification must be one of the + following forms: + + PermitOpen host:port + PermitOpen IPv4_addr:port + PermitOpen [IPv6_addr]:port + + Multiple forwards may be specified by separating them with + whitespace. An argument of any can be used to remove all + restrictions and permit any forwarding requests. An argument of + none can be used to prohibit all forwarding requests. The + wildcard M-bM-^@M-^X*M-bM-^@M-^Y can be used for host or port to allow all hosts or + ports respectively. Otherwise, no pattern matching or address + lookups are performed on supplied names. By default all port + forwarding requests are permitted. + + PermitRootLogin + Specifies whether root can log in using ssh(1). The argument + must be yes, prohibit-password, forced-commands-only, or no. The + default is prohibit-password. + + If this option is set to prohibit-password (or its deprecated + alias, without-password), password and keyboard-interactive + authentication are disabled for root. + + If this option is set to forced-commands-only, root login with + public key authentication will be allowed, but only if the + command option has been specified (which may be useful for taking + remote backups even if root login is normally not allowed). All + other authentication methods are disabled for root. + + If this option is set to no, root is not allowed to log in. + + PermitTTY + Specifies whether pty(4) allocation is permitted. The default is + yes. + + PermitTunnel + Specifies whether tun(4) device forwarding is allowed. The + argument must be yes, point-to-point (layer 3), ethernet (layer + 2), or no. Specifying yes permits both point-to-point and + ethernet. The default is no. + + Independent of this setting, the permissions of the selected + tun(4) device must allow access to the user. + + PermitUserEnvironment + Specifies whether ~/.ssh/environment and environment= options in + ~/.ssh/authorized_keys are processed by sshd(8). Valid options + are yes, no or a pattern-list specifying which environment + variable names to accept (for example "LANG,LC_*"). The default + is no. Enabling environment processing may enable users to + bypass access restrictions in some configurations using + mechanisms such as LD_PRELOAD. + + PermitUserRC + Specifies whether any ~/.ssh/rc file is executed. The default is + yes. + + PerSourceMaxStartups + Specifies the number of unauthenticated connections allowed from + a given source address, or M-bM-^@M-^\noneM-bM-^@M-^] if there is no limit. This + limit is applied in addition to MaxStartups, whichever is lower. + The default is none. + + PerSourceNetBlockSize + Specifies the number of bits of source address that are grouped + together for the purposes of applying PerSourceMaxStartups + limits. Values for IPv4 and optionally IPv6 may be specified, + separated by a colon. The default is 32:128, which means each + address is considered individually. + + PerSourcePenalties + Controls penalties for various conditions that may represent + attacks on sshd(8). If a penalty is enforced against a client + then its source address and any others in the same network, as + defined by PerSourceNetBlockSize, will be refused connection for + a period. + + A penalty doesn't affect concurrent connections in progress, but + multiple penalties from the same source from concurrent + connections will accumulate up to a maximum. Conversely, + penalties are not applied until a minimum threshold time has been + accumulated. + + Penalties are enabled by default with the default settings listed + below but may disabled using the no keyword. The defaults may be + overridden by specifying one or more of the keywords below, + separated by whitespace. All keywords accept arguments, e.g. + "crash:2m". + + crash:duration + Specifies how long to refuse clients that cause a crash + of sshd(8) (default: 90s). + + authfail:duration + Specifies how long to refuse clients that disconnect + after making one or more unsuccessful authentication + attempts (default: 5s). + + invaliduser:duration + Specifies how long to refuse clients that attempt to log + in with an invalid user (default: 5s). + + refuseconnection:duration + Specifies how long to refuse clients that were + administratively prohibited connection via the + RefuseConnection option (default: 10s). + + noauth:duration + Specifies how long to refuse clients that disconnect + without attempting authentication (default: 1s). This + timeout should be used cautiously otherwise it may + penalise legitimate scanning tools such as + ssh-keyscan(1). + + grace-exceeded:duration + Specifies how long to refuse clients that fail to + authenticate after LoginGraceTime (default: 10s). + + max:duration + Specifies the maximum time a particular source address + range will be refused access for (default: 10m). + Repeated penalties will accumulate up to this maximum. + + min:duration + Specifies the minimum penalty that must accrue before + enforcement begins (default: 15s). + + max-sources4:number, max-sources6:number + Specifies the maximum number of client IPv4 and IPv6 + address ranges to track for penalties (default: 65536 for + both). + + overflow:mode + Controls how the server behaves when max-sources4 or + max-sources6 is exceeded. There are two operating modes: + deny-all, which denies all incoming connections other + than those exempted via PerSourcePenaltyExemptList until + a penalty expires, and permissive, which allows new + connections by removing existing penalties early + (default: permissive). Note that client penalties below + the min threshold count against the total number of + tracked penalties. IPv4 and IPv6 addresses are tracked + separately, so an overflow in one will not affect the + other. + + overflow6:mode + Allows specifying a different overflow mode for IPv6 + addresses. The default it to use the same overflow mode + as was specified for IPv4. + + PerSourcePenaltyExemptList + Specifies a comma-separated list of addresses to exempt from + penalties. This list may contain wildcards and CIDR + address/masklen ranges. Note that the mask length provided must + be consistent with the address - it is an error to specify a mask + length that is too long for the address or one with bits set in + this host portion of the address. For example, 192.0.2.0/33 and + 192.0.2.0/8, respectively. The default is not to exempt any + addresses. + + PidFile + Specifies the file that contains the process ID of the SSH + daemon, or none to not write one. The default is + /var/run/sshd.pid. + + Port Specifies the port number that sshd(8) listens on. The default + is 22. Multiple options of this type are permitted. See also + ListenAddress. + + PrintLastLog + Specifies whether sshd(8) should print the date and time of the + last user login when a user logs in interactively. The default + is yes. + + PrintMotd + Specifies whether sshd(8) should print /etc/motd when a user logs + in interactively. (On some systems it is also printed by the + shell, /etc/profile, or equivalent.) The default is yes. + + PubkeyAcceptedAlgorithms + Specifies the signature algorithms that will be accepted for + public key authentication as a list of comma-separated patterns. + Alternately if the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, + then the specified algorithms will be appended to the default set + instead of replacing them. If the specified list begins with a + M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified algorithms (including + wildcards) will be removed from the default set instead of + replacing them. If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y + character, then the specified algorithms will be placed at the + head of the default set. The default for this option is: + + ssh-ed25519-cert-v01@openssh.com, + ecdsa-sha2-nistp256-cert-v01@openssh.com, + ecdsa-sha2-nistp384-cert-v01@openssh.com, + ecdsa-sha2-nistp521-cert-v01@openssh.com, + sk-ssh-ed25519-cert-v01@openssh.com, + sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, + rsa-sha2-512-cert-v01@openssh.com, + rsa-sha2-256-cert-v01@openssh.com, + ssh-mldsa44-ed25519-cert-v01@openssh.com, + ssh-ed25519, + ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, + sk-ssh-ed25519@openssh.com, + sk-ecdsa-sha2-nistp256@openssh.com, + webauthn-sk-ecdsa-sha2-nistp256@openssh.com, + rsa-sha2-512,rsa-sha2-256, + ssh-mldsa44-ed25519@openssh.com + + The list of available signature algorithms may also be obtained + using "ssh -Q PubkeyAcceptedAlgorithms". + + PubkeyAuthOptions + Sets one or more public key authentication options. The + supported keywords are: none (the default; indicating no + additional options are enabled), touch-required and + verify-required. + + The touch-required option causes public key authentication using + a FIDO authenticator algorithm (i.e. ecdsa-sk or ed25519-sk) to + always require the signature to attest that a physically present + user explicitly confirmed the authentication (usually by touching + the authenticator). By default, sshd(8) requires user presence + unless overridden with an authorized_keys option. The + touch-required flag disables this override. + + The verify-required option requires a FIDO key signature attest + that the user was verified, e.g. via a PIN. + + Neither the touch-required or verify-required options have any + effect for other, non-FIDO, public key types. + + PubkeyAuthentication + Specifies whether public key authentication is allowed. The + default is yes. + + RefuseConnection + Indicates that sshd(8) should unconditionally terminate the + connection. Additionally, a refuseconnection penalty may be + recorded against the source of the connection if + PerSourcePenalties are enabled. This option is only really + useful in a Match block. + + RekeyLimit + Specifies the maximum amount of data that may be transmitted or + received before the session key is renegotiated, optionally + followed by a maximum amount of time that may pass before the + session key is renegotiated. The first argument is specified in + bytes and may have a suffix of M-bM-^@M-^XKM-bM-^@M-^Y, M-bM-^@M-^XMM-bM-^@M-^Y, or M-bM-^@M-^XGM-bM-^@M-^Y to indicate + Kilobytes, Megabytes, or Gigabytes, respectively. The default is + between M-bM-^@M-^X1GM-bM-^@M-^Y and M-bM-^@M-^X4GM-bM-^@M-^Y, depending on the cipher. The optional + second value is specified in seconds and may use any of the units + documented in the TIME FORMATS section. The default value for + RekeyLimit is default none, which means that rekeying is + performed after the cipher's default amount of data has been sent + or received and no time based rekeying is done. + + RequiredRSASize + Specifies the minimum RSA key size (in bits) that sshd(8) will + accept. User and host-based authentication keys smaller than + this limit will be refused. The default is 1024 bits. Note that + this limit may only be raised from the default. + + RevokedKeys + Specifies revoked public keys file, or none to not use one. Keys + listed in this file will be refused for public key + authentication. Note that if this file is not readable, then + public key authentication will be refused for all users. Keys + may be specified as a text file, listing one public key per line, + or as an OpenSSH Key Revocation List (KRL) as generated by + ssh-keygen(1). This file may be consulted for each public key + authentication attempt received by sshd(8) and its contents must + be consistent at all times, therefore it should only be + atomically replaced and never modified in place while the server + is running. For more information on KRLs, see the KEY REVOCATION + LISTS section in ssh-keygen(1). + + RDomain + Specifies an explicit routing domain that is applied after + authentication has completed. The user session, as well as any + forwarded or listening IP sockets, will be bound to this + rdomain(4). If the routing domain is set to %D, then the domain + in which the incoming connection was received will be applied. + + SecurityKeyProvider + Specifies a path to a library that will be used when loading FIDO + authenticator-hosted keys, overriding the default of using the + built-in USB HID support. + + SetEnv Specifies one or more environment variables to set in child + sessions started by sshd(8) as M-bM-^@M-^\NAME=VALUEM-bM-^@M-^]. The environment + value may be quoted (e.g. if it contains whitespace characters). + Environment variables set by SetEnv override the default + environment and any variables specified by the user via AcceptEnv + or PermitUserEnvironment. + + SshdAuthPath + Overrides the default path to the sshd-auth binary that is + invoked to complete user authentication. The default is + /usr/libexec/sshd-auth. This option is intended for use by + tests. + + SshdSessionPath + Overrides the default path to the sshd-session binary that is + invoked to handle each connection. The default is + /usr/libexec/sshd-session. This option is intended for use by + tests. + + StreamLocalBindMask + Sets the octal file creation mode mask (umask) used when creating + a Unix-domain socket file for local or remote port forwarding. + This option is only used for port forwarding to a Unix-domain + socket file. + + The default value is 0177, which creates a Unix-domain socket + file that is readable and writable only by the owner. Note that + not all operating systems honor the file mode on Unix-domain + socket files. + + StreamLocalBindUnlink + Specifies whether to remove an existing Unix-domain socket file + for local or remote port forwarding before creating a new one. + If the socket file already exists and StreamLocalBindUnlink is + not enabled, sshd will be unable to forward the port to the Unix- + domain socket file. This option is only used for port forwarding + to a Unix-domain socket file. + + The argument must be yes or no. The default is no. + + StrictModes + Specifies whether sshd(8) should check file modes and ownership + of the user's files and home directory before accepting login. + This is normally desirable because novices sometimes accidentally + leave their directory or files world-writable. The default is + yes. Note that this does not apply to ChrootDirectory, whose + permissions and ownership are checked unconditionally. + + Subsystem + Configures an external subsystem (e.g. file transfer daemon). + Arguments should be a subsystem name and a command (with optional + arguments) to execute upon subsystem request. + + The command sftp-server implements the SFTP file transfer + subsystem. + + Alternately the name internal-sftp implements an in-process SFTP + server. This may simplify configurations using ChrootDirectory + to force a different filesystem root on clients. It accepts the + same command line arguments as sftp-server and even though it is + in-process, settings such as LogLevel or SyslogFacility do not + apply to it and must be set explicitly via command line + arguments. + + By default no subsystems are defined. + + SyslogFacility + Gives the facility code that is used when logging messages from + sshd(8). The possible values are: DAEMON, USER, AUTH, LOCAL0, + LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The + default is AUTH. + + TCPKeepAlive + Specifies whether the system should send TCP keepalive messages + to the other side. If they are sent, death of the connection or + crash of one of the machines will be properly noticed. However, + this means that connections will die if the route is down + temporarily, and some people find it annoying. On the other + hand, if TCP keepalives are not sent, sessions may hang + indefinitely on the server, leaving "ghost" users and consuming + server resources. + + The default is yes (to send TCP keepalive messages), and the + server will notice if the network goes down or the client host + crashes. This avoids infinitely hanging sessions. + + To disable TCP keepalive messages, the value should be set to no. + + TrustedUserCAKeys + Specifies a file containing public keys of certificate + authorities that are trusted to sign user certificates for + authentication, or none to not use one. Keys are listed one per + line; empty lines and comments starting with M-bM-^@M-^X#M-bM-^@M-^Y are allowed. If + a certificate is presented for authentication and has its signing + CA key listed in this file, then it may be used for + authentication for any user listed in the certificate's + principals list. Note that certificates that lack a list of + principals will not be permitted for authentication using + TrustedUserCAKeys. For more details on certificates, see the + CERTIFICATES section in ssh-keygen(1). + + UnusedConnectionTimeout + Specifies whether and how quickly sshd(8) should close client + connections with no open channels. Open channels include active + shell, command execution or subsystem sessions, connected + network, socket, agent or X11 forwardings. Forwarding listeners, + such as those from the ssh(1) -R flag, are not considered as open + channels and do not prevent the timeout. The timeout value is + specified in seconds or may use any of the units documented in + the TIME FORMATS section. + + Note that this timeout starts when the client connection + completes user authentication but before the client has an + opportunity to open any channels. Caution should be used when + using short timeout values, as they may not provide sufficient + time for the client to request and open its channels before + terminating the connection. + + The default none is to never expire connections for having no + open channels. This option may be useful in conjunction with + ChannelTimeout. + + UseDNS Specifies whether sshd(8) should look up the remote host name, + and to check that the resolved host name for the remote IP + address maps back to the very same IP address. + + If this option is set to no (the default) then only addresses and + not host names may be used in ~/.ssh/authorized_keys from and + sshd_config Match Host directives. + + UsePAM Enables the Pluggable Authentication Module interface. If set to + yes this will enable PAM authentication using + KbdInteractiveAuthentication and PasswordAuthentication in + addition to PAM account and session module processing for all + authentication types. + + Because PAM keyboard-interactive authentication usually serves an + equivalent role to password authentication, you should disable + either PasswordAuthentication or KbdInteractiveAuthentication. + + If UsePAM is enabled, you will not be able to run sshd(8) as a + non-root user. The default is no. + + VersionAddendum + Optionally specifies additional text to append to the SSH + protocol banner sent by the server upon connection. The default + is none. + + X11DisplayOffset + Specifies the first display number available for sshd(8)'s X11 + forwarding. This prevents sshd from interfering with real X11 + servers. The default is 10. + + X11Forwarding + Specifies whether X11 forwarding is permitted. The argument must + be yes or no. The default is no. + + When X11 forwarding is enabled, there may be additional exposure + to the server and to client displays if the sshd(8) proxy display + is configured to listen on the wildcard address (see + X11UseLocalhost), though this is not the default. Additionally, + the authentication spoofing and authentication data verification + and substitution occur on the client side. The security risk of + using X11 forwarding is that the client's X11 display server may + be exposed to attack when the SSH client requests forwarding (see + the warnings for ForwardX11 in ssh_config(5)). A system + administrator may have a stance in which they want to protect + clients that may expose themselves to attack by unwittingly + requesting X11 forwarding, which can warrant a no setting. + + Note that disabling X11 forwarding does not prevent users from + forwarding X11 traffic, as users can always install their own + forwarders. + + X11UseLocalhost + Specifies whether sshd(8) should bind the X11 forwarding server + to the loopback address or to the wildcard address. By default, + sshd binds the forwarding server to the loopback address and sets + the hostname part of the DISPLAY environment variable to + localhost. This prevents remote hosts from connecting to the + proxy display. However, some older X11 clients may not function + with this configuration. X11UseLocalhost may be set to no to + specify that the forwarding server should be bound to the + wildcard address. The argument must be yes or no. The default + is yes. + + XAuthLocation + Specifies the full pathname of the xauth(1) program, or none to + not use one. The default is /usr/X11R6/bin/xauth. + +TIME FORMATS + sshd(8) command-line arguments and configuration file options that + specify time may be expressed using a sequence of the form: + time[qualifier], where time is a positive integer value and qualifier is + one of the following: + + M-bM-^_M-(noneM-bM-^_M-) seconds + s | S seconds + m | M minutes + h | H hours + d | D days + w | W weeks + + Each member of the sequence is added together to calculate the total time + value. + + Time format examples: + + 600 600 seconds (10 minutes) + 10m 10 minutes + 1h30m 1 hour 30 minutes (90 minutes) + +TOKENS + Arguments to some keywords can make use of tokens, which are expanded at + runtime. Tokens are expanded without quoting or escaping of shell + characters. It is the administrator's responsibility to ensure they are + safe in the context of their use. + + The supported tokens in sshd_config are: + + %% A literal M-bM-^@M-^X%M-bM-^@M-^Y. + %C Identifies the connection endpoints, containing four space- + separated values: client address, client port number, server + address, and server port number. + %D The routing domain in which the incoming connection was + received. + %F The fingerprint of the CA key. + %f The fingerprint of the key or certificate. + %h The home directory of the user. + %i The key ID in the certificate. + %K The base64-encoded CA key. + %k The base64-encoded key or certificate for authentication. + %s The serial number of the certificate. + %T The type of the CA key. + %t The key or certificate type. + %U The numeric user ID of the target user. + %u The username. + + AuthorizedKeysCommand accepts the tokens %%, %C, %D, %f, %h, %k, %t, %U, + and %u. + + AuthorizedKeysFile accepts the tokens %%, %h, %U, and %u. + + AuthorizedPrincipalsCommand accepts the tokens %%, %C, %D, %F, %f, %h, + %i, %K, %k, %s, %T, %t, %U, and %u. + + AuthorizedPrincipalsFile accepts the tokens %%, %h, %U, and %u. + + ChrootDirectory accepts the tokens %%, %h, %U, and %u. + + RoutingDomain accepts the token %D. + +FILES + /etc/ssh/sshd_config + Contains configuration data for sshd(8). This file should be + writable by root only, but it is recommended (though not + necessary) that it be world-readable. + +SEE ALSO + sftp-server(8), sshd(8) + +AUTHORS + OpenSSH is a derivative of the original and free ssh 1.2.12 release by + Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo + de Raadt and Dug Song removed many bugs, re-added newer features and + created OpenSSH. Markus Friedl contributed the support for SSH protocol + versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support + for privilege separation. + +OpenBSD 8.0 August 8, 2026 SSHD_CONFIG(5) diff --git a/sshkey.c b/sshkey.c index 5d81e9bf404c..8cc8c9a0abae 100644 --- a/sshkey.c +++ b/sshkey.c @@ -90,27 +90,23 @@ extern const struct sshkey_impl sshkey_ed25519_impl; extern const struct sshkey_impl sshkey_ed25519_cert_impl; extern const struct sshkey_impl sshkey_ed25519_sk_impl; extern const struct sshkey_impl sshkey_ed25519_sk_cert_impl; -#ifdef USE_MLDSA +# ifdef USE_MLDSA extern const struct sshkey_impl sshkey_mldsa44_ed25519_impl; extern const struct sshkey_impl sshkey_mldsa44_ed25519_cert_impl; -#endif /* USE_MLDSA */ +# endif /* USE_MLDSA */ #ifdef WITH_OPENSSL -# ifdef OPENSSL_HAS_ECC -# ifdef ENABLE_SK +# ifdef ENABLE_SK extern const struct sshkey_impl sshkey_ecdsa_sk_impl; extern const struct sshkey_impl sshkey_ecdsa_sk_cert_impl; extern const struct sshkey_impl sshkey_ecdsa_sk_webauthn_impl; extern const struct sshkey_impl sshkey_ecdsa_sk_webauthn_cert_impl; -# endif /* ENABLE_SK */ +# endif /* ENABLE_SK */ extern const struct sshkey_impl sshkey_ecdsa_nistp256_impl; extern const struct sshkey_impl sshkey_ecdsa_nistp256_cert_impl; extern const struct sshkey_impl sshkey_ecdsa_nistp384_impl; extern const struct sshkey_impl sshkey_ecdsa_nistp384_cert_impl; -# ifdef OPENSSL_HAS_NISTP521 extern const struct sshkey_impl sshkey_ecdsa_nistp521_impl; extern const struct sshkey_impl sshkey_ecdsa_nistp521_cert_impl; -# endif /* OPENSSL_HAS_NISTP521 */ -# endif /* OPENSSL_HAS_ECC */ extern const struct sshkey_impl sshkey_rsa_impl; extern const struct sshkey_impl sshkey_rsa_cert_impl; extern const struct sshkey_impl sshkey_rsa_sha256_impl; @@ -131,22 +127,18 @@ const struct sshkey_impl * const keyimpls[] = { &sshkey_mldsa44_ed25519_cert_impl, #endif /* USE_MLDSA */ #ifdef WITH_OPENSSL -# ifdef OPENSSL_HAS_ECC &sshkey_ecdsa_nistp256_impl, &sshkey_ecdsa_nistp256_cert_impl, &sshkey_ecdsa_nistp384_impl, &sshkey_ecdsa_nistp384_cert_impl, -# ifdef OPENSSL_HAS_NISTP521 &sshkey_ecdsa_nistp521_impl, &sshkey_ecdsa_nistp521_cert_impl, -# endif /* OPENSSL_HAS_NISTP521 */ -# ifdef ENABLE_SK +# ifdef ENABLE_SK &sshkey_ecdsa_sk_impl, &sshkey_ecdsa_sk_cert_impl, &sshkey_ecdsa_sk_webauthn_impl, &sshkey_ecdsa_sk_webauthn_cert_impl, -# endif /* ENABLE_SK */ -# endif /* OPENSSL_HAS_ECC */ +# endif /* ENABLE_SK */ &sshkey_rsa_impl, &sshkey_rsa_cert_impl, &sshkey_rsa_sha256_impl, @@ -579,10 +571,8 @@ sshkey_curve_name_to_nid(const char *name) return NID_X9_62_prime256v1; else if (strcmp(name, "nistp384") == 0) return NID_secp384r1; -# ifdef OPENSSL_HAS_NISTP521 else if (strcmp(name, "nistp521") == 0) return NID_secp521r1; -# endif /* OPENSSL_HAS_NISTP521 */ else return -1; } @@ -595,10 +585,8 @@ sshkey_curve_nid_to_bits(int nid) return 256; case NID_secp384r1: return 384; -# ifdef OPENSSL_HAS_NISTP521 case NID_secp521r1: return 521; -# endif /* OPENSSL_HAS_NISTP521 */ default: return 0; } @@ -612,10 +600,8 @@ sshkey_ecdsa_bits_to_nid(int bits) return NID_X9_62_prime256v1; case 384: return NID_secp384r1; -# ifdef OPENSSL_HAS_NISTP521 case 521: return NID_secp521r1; -# endif /* OPENSSL_HAS_NISTP521 */ default: return -1; } @@ -629,10 +615,8 @@ sshkey_curve_nid_to_name(int nid) return "nistp256"; case NID_secp384r1: return "nistp384"; -# ifdef OPENSSL_HAS_NISTP521 case NID_secp521r1: return "nistp521"; -# endif /* OPENSSL_HAS_NISTP521 */ default: return NULL; } @@ -1482,7 +1466,7 @@ sshkey_check_rsa_length(const struct sshkey *k, int min_size) return 0; } -#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) +#ifdef WITH_OPENSSL int sshkey_ecdsa_key_to_nid(const EC_KEY *k) { @@ -1501,7 +1485,7 @@ sshkey_ecdsa_pkey_to_nid(EVP_PKEY *pkey) { return sshkey_ecdsa_key_to_nid(EVP_PKEY_get0_EC_KEY(pkey)); } -#endif /* defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) */ +#endif /* WITH_OPENSSL */ int sshkey_generate(int type, u_int bits, struct sshkey **keyp) @@ -2691,7 +2675,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp) return r; } -#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) +#ifdef WITH_OPENSSL int sshkey_ec_validate_public(const EC_GROUP *group, const EC_POINT *public) { @@ -2828,7 +2812,7 @@ sshkey_dump_ec_key(const EC_KEY *key) BN_print_fp(stderr, EC_KEY_get0_private_key(key)); fputs("\n", stderr); } -#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */ +#endif /* WITH_OPENSSL */ static int sshkey_private_to_blob2(struct sshkey *prv, struct sshbuf *blob, @@ -3324,7 +3308,6 @@ sshkey_private_to_blob_pem_pkcs8(struct sshkey *key, struct sshbuf *buf, goto out; switch (key->type) { -#ifdef OPENSSL_HAS_ECC case KEY_ECDSA: if (format == SSHKEY_PRIVATE_PEM) { success = PEM_write_bio_ECPrivateKey(bio, @@ -3336,7 +3319,6 @@ sshkey_private_to_blob_pem_pkcs8(struct sshkey *key, struct sshbuf *buf, success = 1; } break; -#endif case KEY_RSA: if (format == SSHKEY_PRIVATE_PEM) { success = PEM_write_bio_RSAPrivateKey(bio, @@ -3581,7 +3563,6 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, prv->pkey = pk; if ((r = sshkey_check_rsa_length(prv, 0)) != 0) goto out; -#ifdef OPENSSL_HAS_ECC } else if (EVP_PKEY_base_id(pk) == EVP_PKEY_EC && (type == KEY_UNSPEC || type == KEY_ECDSA)) { if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) { @@ -3607,7 +3588,6 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, if (prv != NULL && prv->pkey != NULL) sshkey_dump_ec_key(EVP_PKEY_get0_EC_KEY(prv->pkey)); #endif -#endif /* OPENSSL_HAS_ECC */ #ifdef OPENSSL_HAS_ED25519 } else if (EVP_PKEY_base_id(pk) == EVP_PKEY_ED25519 && (type == KEY_UNSPEC || type == KEY_ED25519)) { @@ -3658,9 +3638,7 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, BIO_free(bio); EVP_PKEY_free(pk); RSA_free(rsa); -#ifdef OPENSSL_HAS_ECC EC_KEY_free(ecdsa); -#endif sshkey_free(prv); return r; } diff --git a/sshkey.h b/sshkey.h index 9ad5583a24a4..e4f84f16f15d 100644 --- a/sshkey.h +++ b/sshkey.h @@ -30,23 +30,17 @@ #ifdef WITH_OPENSSL #include +#include +#include #include -# ifdef OPENSSL_HAS_ECC -# include -# include -# else /* OPENSSL_HAS_ECC */ -# define EC_KEY void -# define EC_GROUP void -# define EC_POINT void -# endif /* OPENSSL_HAS_ECC */ #define SSH_OPENSSL_VERSION OpenSSL_version(OPENSSL_VERSION) -#else /* WITH_OPENSSL */ -# define BIGNUM void -# define RSA void -# define EC_KEY void -# define EC_GROUP void -# define EC_POINT void -# define EVP_PKEY void +#else /* OPENSSL */ +#define BIGNUM void +#define RSA void +#define EC_KEY void +#define EC_GROUP void +#define EC_POINT void +#define EVP_PKEY void #define SSH_OPENSSL_VERSION "without OpenSSL" #endif /* WITH_OPENSSL */ @@ -334,16 +328,12 @@ int check_rsa_length(const RSA *rsa); /* XXX remove */ #endif #endif -#if !defined(WITH_OPENSSL) -# undef RSA -# undef EC_KEY -# undef EC_GROUP -# undef EC_POINT -# undef EVP_PKEY -#elif !defined(OPENSSL_HAS_ECC) -# undef EC_KEY -# undef EC_GROUP -# undef EC_POINT -#endif +#ifndef WITH_OPENSSL +#undef RSA +#undef EC_KEY +#undef EC_GROUP +#undef EC_POINT +#undef EVP_PKEY +#endif /* WITH_OPENSSL */ #endif /* SSHKEY_H */ diff --git a/version.h b/version.h index a2171de8ab19..48d7e1b70031 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ -/* $OpenBSD: version.h,v 1.109 2026/07/06 07:54:26 djm Exp $ */ +/* $OpenBSD: version.h,v 1.110 2026/08/10 23:27:30 djm Exp $ */ -#define SSH_VERSION "OpenSSH_10.4" +#define SSH_VERSION "OpenSSH_10.5" #define SSH_PORTABLE "p1" -#define SSH_HPN "_hpn18.10.0" +#define SSH_HPN "_hpn18.11.0" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN