1 files changed, 74 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index 7e0584d2c..5944299fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.583 $)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -34,8 +34,6 @@ AC_CHECK_TOOLS([AR], [ar])
 AC_PATH_PROG([CAT], [cat])
 AC_PATH_PROG([KILL], [kill])
 AC_PATH_PROG([SED], [sed])
-AC_PATH_PROG([ENT], [ent])
-AC_SUBST([ENT])
 AC_PATH_PROG([TEST_MINUS_S_SH], [bash])
 AC_PATH_PROG([TEST_MINUS_S_SH], [ksh])
 AC_PATH_PROG([TEST_MINUS_S_SH], [sh])
@@ -164,6 +162,7 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
         OSSH_CHECK_CFLAG_COMPILE([-Wformat-security])
         OSSH_CHECK_CFLAG_COMPILE([-Wsizeof-pointer-memaccess])
         OSSH_CHECK_CFLAG_COMPILE([-Wpointer-sign], [-Wno-pointer-sign])
+        OSSH_CHECK_CFLAG_COMPILE([-Wunused-parameter], [-Wno-unused-parameter])
         OSSH_CHECK_CFLAG_COMPILE([-Wunused-result], [-Wno-unused-result])
         OSSH_CHECK_CFLAG_COMPILE([-Wimplicit-fallthrough])
         OSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing])
@@ -522,6 +521,8 @@ SPP_MSG="no"
 # the --with-solaris-privs option and --with-sandbox=solaris).
 SOLARIS_PRIVS="no"
 
+AC_CHECK_SIZEOF([size_t])
+
 # Check for some target-specific stuff
 case "$host" in
 *-*-aix*)
@@ -652,7 +653,9 @@ case "$host" in
 *-*-darwin*)
         use_pie=auto
         AC_MSG_CHECKING([if we have working getaddrinfo])
-        AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <mach-o/dyld.h>
+        AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <mach-o/dyld.h>
+#include <stdlib.h>
 main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
                 exit(0);
         else
@@ -888,6 +891,10 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
         case "$host" in
         x86_64-*)
                 seccomp_audit_arch=AUDIT_ARCH_X86_64
+                # X32: AMD64 instructions in 32bit address space.
+                if test "x$ac_cv_sizeof_size_t" = "x4" ; then
+                        seccomp_audit_arch=AUDIT_ARCH_I386
+                fi
                 ;;
         i*86-*)
                 seccomp_audit_arch=AUDIT_ARCH_I386
@@ -936,6 +943,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
                         ;;
                 esac
                 ;;
+        riscv64-*)
+                seccomp_audit_arch=AUDIT_ARCH_RISCV64
+                ;;
         esac
         if test "x$seccomp_audit_arch" != "x" ; then
                 AC_MSG_RESULT(["$seccomp_audit_arch"])
@@ -1257,7 +1267,7 @@ EOD
 esac
 
 AC_MSG_CHECKING([compiler and flags for sanity])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]], [[ exit(0); ]])],
+AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdlib.h> ]], [[ exit(0); ]])],
         [       AC_MSG_RESULT([yes]) ],
         [
                 AC_MSG_RESULT([no])
@@ -1281,6 +1291,7 @@ AC_CHECK_FUNCS([dirname], [AC_CHECK_HEADERS([libgen.h])] , [
                                 [AC_LANG_SOURCE([[
 #include <libgen.h>
 #include <string.h>
+#include <stdlib.h>
 
 int main(int argc, char **argv) {
     char *s, buf[32];
@@ -1532,7 +1543,9 @@ AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
 AC_RUN_IFELSE(
         [AC_LANG_PROGRAM([[
 #include <sys/types.h>
-#include <dirent.h>]],
+#include <dirent.h>
+#include <stdlib.h>
+        ]],
         [[
         struct dirent d;
         exit(sizeof(d.d_name)<=sizeof(char));
@@ -1702,7 +1715,10 @@ AC_ARG_WITH([libedit],
                 )
                 AC_MSG_CHECKING([if libedit version is compatible])
                 AC_COMPILE_IFELSE(
-                    [AC_LANG_PROGRAM([[ #include <histedit.h> ]],
+                    [AC_LANG_PROGRAM([[
+#include <histedit.h>
+#include <stdlib.h>
+                    ]],
                     [[
         int i = H_SETSIZE;
         el_init("", NULL, NULL, NULL);
@@ -2192,7 +2208,11 @@ AC_CHECK_FUNCS([setresgid], [
 
 AC_MSG_CHECKING([for working fflush(NULL)])
 AC_RUN_IFELSE(
-        [AC_LANG_PROGRAM([[#include <stdio.h>]], [[fflush(NULL); exit(0);]])],
+        [AC_LANG_PROGRAM([[
+#include <stdio.h>
+#include <stdlib.h>
+        ]],
+        [[fflush(NULL); exit(0);]])],
         AC_MSG_RESULT([yes]),
         [AC_MSG_RESULT([no])
          AC_DEFINE([FFLUSH_NULL_BUG], [1],
@@ -2228,7 +2248,10 @@ AC_CHECK_FUNC([getpagesize],
 if test "x$ac_cv_func_snprintf" = "xyes" ; then
         AC_MSG_CHECKING([whether snprintf correctly terminates long strings])
         AC_RUN_IFELSE(
-                [AC_LANG_PROGRAM([[ #include <stdio.h> ]],
+                [AC_LANG_PROGRAM([[
+#include <stdio.h>
+#include <stdlib.h>
+                ]],
                 [[
         char b[5];
         snprintf(b,5,"123456789");
@@ -2251,6 +2274,8 @@ if test "x$ac_cv_func_snprintf" = "xyes" ; then
                 [AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
                 ]],
                 [[
         size_t a = 1, b = 2;
@@ -2343,6 +2368,7 @@ AC_MSG_CHECKING([for (overly) strict mkstemp])
 AC_RUN_IFELSE(
         [AC_LANG_PROGRAM([[
 #include <stdlib.h>
+#include <unistd.h>
         ]], [[
         char template[]="conftest.mkstemp-test";
         if (mkstemp(template) == -1)
@@ -2370,6 +2396,8 @@ if test ! -z "$check_for_openpty_ctty_bug"; then
         AC_RUN_IFELSE(
                 [AC_LANG_PROGRAM([[
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <sys/fcntl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2416,6 +2444,7 @@ if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
         AC_RUN_IFELSE(
                 [AC_LANG_PROGRAM([[
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <errno.h>
@@ -2484,6 +2513,7 @@ if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
         AC_RUN_IFELSE(
                 [AC_LANG_PROGRAM([[
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <errno.h>
@@ -2546,7 +2576,10 @@ fi
 
 if test "x$check_for_conflicting_getspnam" = "x1"; then
         AC_MSG_CHECKING([for conflicting getspnam in shadow.h])
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <shadow.h> ]],
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <shadow.h>
+#include <stdlib.h>
+                ]],
                 [[ exit(0); ]])],
                 [
                         AC_MSG_RESULT([no])
@@ -2576,6 +2609,7 @@ if test "x$ac_cv_func_strnvis" = "xyes"; then
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <vis.h>
 static void sighandler(int sig) { _exit(1); }
                 ]], [[
@@ -2604,6 +2638,7 @@ AC_RUN_IFELSE(
 #include <sys/time.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <unistd.h>
 static void sighandler(int sig) { }
                 ]], [[
         int r;
@@ -2760,6 +2795,7 @@ if test "x$openssl" = "xyes" ; then
         AC_RUN_IFELSE(
                 [AC_LANG_PROGRAM([[
         #include <stdio.h>
+        #include <stdlib.h>
         #include <string.h>
         #include <openssl/opensslv.h>
         #include <openssl/crypto.h>
@@ -2821,6 +2857,7 @@ if test "x$openssl" = "xyes" ; then
         AC_MSG_CHECKING([whether OpenSSL's headers match the library])
         AC_RUN_IFELSE(
                 [AC_LANG_PROGRAM([[
+        #include <stdlib.h>
         #include <string.h>
         #include <openssl/opensslv.h>
         #include <openssl/crypto.h>
@@ -2960,6 +2997,7 @@ if test "x$openssl" = "xyes" ; then
         AC_MSG_CHECKING([whether OpenSSL has crippled AES support])
         AC_LINK_IFELSE(
                 [AC_LANG_PROGRAM([[
+        #include <stdlib.h>
         #include <string.h>
         #include <openssl/evp.h>
                 ]], [[
@@ -2979,6 +3017,7 @@ if test "x$openssl" = "xyes" ; then
         AC_MSG_CHECKING([whether OpenSSL has AES CTR via EVP])
         AC_LINK_IFELSE(
                 [AC_LANG_PROGRAM([[
+        #include <stdlib.h>
         #include <string.h>
         #include <openssl/evp.h>
                 ]], [[
@@ -3000,6 +3039,7 @@ if test "x$openssl" = "xyes" ; then
         AC_MSG_CHECKING([whether OpenSSL has AES GCM via EVP])
         AC_LINK_IFELSE(
                 [AC_LANG_PROGRAM([[
+        #include <stdlib.h>
         #include <string.h>
         #include <openssl/evp.h>
                 ]], [[
@@ -3027,6 +3067,7 @@ if test "x$openssl" = "xyes" ; then
         AC_MSG_CHECKING([if EVP_DigestUpdate returns an int])
         AC_LINK_IFELSE(
                 [AC_LANG_PROGRAM([[
+        #include <stdlib.h>
         #include <string.h>
         #include <openssl/evp.h>
                 ]], [[
@@ -3113,6 +3154,7 @@ if test "x$openssl" = "xyes" ; then
                   AC_MSG_CHECKING([if OpenSSL's NID_secp521r1 is functional])
                   AC_RUN_IFELSE(
                         [AC_LANG_PROGRAM([[
+        #include <stdlib.h>
         #include <openssl/ec.h>
         #include <openssl/ecdh.h>
         #include <openssl/ecdsa.h>
@@ -3253,6 +3295,16 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then
                 ], [ AC_MSG_ERROR([no usable libfido2 found]) ],
                 [ $OTHERLIBS ]
         )
+        saved_LIBS="$LIBS"
+        LIBS="$LIBS $LIBFIDO2"
+        AC_CHECK_FUNCS([ \
+                fido_cred_prot \
+                fido_cred_set_prot \
+                fido_dev_get_touch_begin \
+                fido_dev_get_touch_status \
+                fido_dev_supports_cred_prot \
+        ])
+        LIBS="$saved_LIBS"
         AC_CHECK_HEADER([fido.h], [],
                 AC_MSG_ERROR([missing fido.h from libfido2]))
         AC_CHECK_HEADER([fido/credman.h], [],
@@ -3285,6 +3337,7 @@ if test "x$openssl" = "xyes" ; then
         AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded])
         AC_RUN_IFELSE(
                 [AC_LANG_PROGRAM([[
+        #include <stdlib.h>
         #include <string.h>
         #include <openssl/rand.h>
                 ]], [[
@@ -3716,6 +3769,7 @@ if test -z "$have_llong_max" && test -z "$have_long_long_max"; then
         AC_RUN_IFELSE(
                 [AC_LANG_PROGRAM([[
 #include <stdio.h>
+#include <stdlib.h>
 /* Why is this so damn hard? */
 #ifdef __GNUC__
 # undef __GNUC__
@@ -4231,6 +4285,7 @@ dnl test snprintf (broken on SCO w/gcc)
         AC_RUN_IFELSE(
                 [AC_LANG_SOURCE([[
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_SNPRINTF
 main()
@@ -4275,6 +4330,7 @@ OSSH_CHECK_HEADER_FOR_FIELD([ut_exit], [utmp.h], [HAVE_EXIT_IN_UTMP])
 OSSH_CHECK_HEADER_FOR_FIELD([ut_time], [utmp.h], [HAVE_TIME_IN_UTMP])
 OSSH_CHECK_HEADER_FOR_FIELD([ut_time], [utmpx.h], [HAVE_TIME_IN_UTMPX])
 OSSH_CHECK_HEADER_FOR_FIELD([ut_tv], [utmpx.h], [HAVE_TV_IN_UTMPX])
+OSSH_CHECK_HEADER_FOR_FIELD([ut_ss], [utmpx.h], [HAVE_SS_IN_UTMPX])
 
 AC_CHECK_MEMBERS([struct stat.st_blksize])
 AC_CHECK_MEMBERS([struct stat.st_mtim])
@@ -4333,6 +4389,7 @@ AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
+#include <stdlib.h>
                 ]], [[
 #ifdef msg_accrights
 #error "msg_accrights is a macro"
@@ -4394,6 +4451,7 @@ AC_CACHE_CHECK([for msg_control field in struct msghdr],
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
+#include <stdlib.h>
                 ]], [[
 #ifdef msg_control
 #error "msg_control is a macro"
@@ -4414,7 +4472,7 @@ if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
 fi
 
 AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]],
                 [[ extern char *__progname; printf("%s", __progname); ]])],
         [ ac_cv_libc_defines___progname="yes" ],
         [ ac_cv_libc_defines___progname="no"
@@ -4486,7 +4544,7 @@ if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
 fi
 
 AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]],
 [[ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);]])],
         [ ac_cv_libc_defines_sys_errlist="yes" ],
         [ ac_cv_libc_defines_sys_errlist="no"
@@ -4499,7 +4557,7 @@ fi
 
 
 AC_CACHE_CHECK([if libc defines sys_nerr], ac_cv_libc_defines_sys_nerr, [
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]],
 [[ extern int sys_nerr; printf("%i", sys_nerr);]])],
         [ ac_cv_libc_defines_sys_nerr="yes" ],
         [ ac_cv_libc_defines_sys_nerr="no"
@@ -4593,13 +4651,10 @@ AC_ARG_WITH([selinux],
                           LIBS="$LIBS -lselinux"
                         ],
                         AC_MSG_ERROR([SELinux support requires libselinux library]))
-                SSHLIBS="$SSHLIBS $LIBSELINUX"
-                SSHDLIBS="$SSHDLIBS $LIBSELINUX"
                 AC_CHECK_FUNCS([getseuserbyname get_default_context_with_level])
-                LIBS="$save_LIBS"
+                LIBS="$save_LIBS $LIBSELINUX"
         fi ]
 )
-AC_SUBST([SSHLIBS])
 AC_SUBST([SSHDLIBS])
 
 # Check whether user wants Kerberos 5 support
@@ -4834,6 +4889,7 @@ AC_ARG_WITH([maildir],
             AC_RUN_IFELSE(
                 [AC_LANG_PROGRAM([[
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_PATHS_H
 #include <paths.h>
@@ -5078,6 +5134,7 @@ otherwise scp will not work.])
                         [AC_LANG_PROGRAM([[
 /* find out what STDPATH is */
 #include <stdio.h>
+#include <stdlib.h>
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
@@ -5585,9 +5642,6 @@ echo "         Libraries: ${LIBS}"
 if test ! -z "${SSHDLIBS}"; then
 echo "         +for sshd: ${SSHDLIBS}"
 fi
-if test ! -z "${SSHLIBS}"; then
-echo "          +for ssh: ${SSHLIBS}"
-fi
 
 echo ""