]> andersk Git - openssh.git/blobdiff - configure.in
- Integrate Andre Lucas' <andre.lucas@dial.pipex.com> entropy collection
[openssh.git] / configure.in
index 14dd51081b3108fdd426be0e3e76d840eea5d327..c533d4209ab3efa7449bce773729bf98b9958281 100644 (file)
@@ -12,36 +12,6 @@ AC_CHECK_PROG(AR, ar, ar)
 AC_PATH_PROG(PERL, perl)
 AC_SUBST(PERL)
 
-# We may need these for entropy collection
-AC_PATH_PROG(PROG_LS, ls)
-AC_DEFINE_UNQUOTED(PROG_LS, "$PROG_LS")
-AC_PATH_PROG(PROG_NETSTAT, netstat)
-AC_DEFINE_UNQUOTED(PROG_NETSTAT, "$PROG_NETSTAT")
-AC_PATH_PROG(PROG_ARP, arp)
-AC_DEFINE_UNQUOTED(PROG_ARP, "$PROG_ARP")
-AC_PATH_PROG(PROG_IFCONFIG, ifconfig)
-AC_DEFINE_UNQUOTED(PROG_IFCONFIG, "$PROG_IFCONFIG")
-AC_PATH_PROG(PROG_PS, ps)
-AC_DEFINE_UNQUOTED(PROG_PS, "$PROG_PS")
-AC_PATH_PROG(PROG_W, w)
-AC_DEFINE_UNQUOTED(PROG_W, "$PROG_W")
-AC_PATH_PROG(PROG_WHO, who)
-AC_DEFINE_UNQUOTED(PROG_WHO, "$PROG_WHO")
-AC_PATH_PROG(PROG_LAST, last)
-AC_DEFINE_UNQUOTED(PROG_LAST, "$PROG_LAST")
-AC_PATH_PROG(PROG_LASTLOG, lastlog)
-AC_DEFINE_UNQUOTED(PROG_LASTLOG, "$PROG_LASTLOG")
-AC_PATH_PROG(PROG_DF, df)
-AC_DEFINE_UNQUOTED(PROG_DF, "$PROG_DF")
-AC_PATH_PROG(PROG_VMSTAT, vmstat)
-AC_DEFINE_UNQUOTED(PROG_VMSTAT, "$PROG_VMSTAT")
-AC_PATH_PROG(PROG_UPTIME, uptime)
-AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME")
-AC_PATH_PROG(PROG_IPCS, ipcs)
-AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME")
-AC_PATH_PROG(PROG_TAIL, tail)
-AC_DEFINE_UNQUOTED(PROG_TAIL, "$PROG_TAIL")
-
 if test -z "$LD" ; then
        LD=$CC
 fi
@@ -73,6 +43,29 @@ case "$host" in
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        AC_DEFINE(IPADDR_IN_DISPLAY)
        AC_DEFINE(USE_UTMPX)
+       AC_DEFINE(NEED_IN_SYSTM_H)
+       AC_MSG_CHECKING(for HPUX trusted system password database)
+       if test -f /tcb/files/auth/system/default; then
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_HPUX_TRUSTED_SYSTEM_PW)
+               LIBS="$LIBS -lsec"
+               AC_MSG_WARN([This configuration is untested])
+       else
+               AC_MSG_RESULT(no)
+               AC_DEFINE(DISABLE_SHADOW)
+       fi
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
+       ;;
+*-*-hpux11*)
+       if test -z "$GCC"; then
+               CFLAGS="$CFLAGS -Ae"
+       fi
+       CFLAGS="$CFLAGS -D_HPUX_SOURCE"
+       CFLAGS="$CFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       AC_DEFINE(IPADDR_IN_DISPLAY)
+       AC_DEFINE(USE_UTMPX)
        AC_MSG_CHECKING(for HPUX trusted system password database)
        if test -f /tcb/files/auth/system/default; then
                AC_MSG_RESULT(yes)
@@ -140,7 +133,7 @@ fi
 AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h)
 
 # Checks for library functions.
-AC_CHECK_FUNCS(arc4random bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty)
+AC_CHECK_FUNCS(arc4random bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf vhangup _getpty)
 
 AC_CHECK_FUNC(login, 
        [AC_DEFINE(HAVE_LOGIN)],
@@ -170,12 +163,14 @@ if test -z "$no_pam" -a "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then
        AC_CHECK_LIB(dl, dlopen, , )
        LIBS="$LIBS -lpam"
 
+       AC_CHECK_FUNC(pam_getenvlist)
+
        # Check PAM strerror arguments (old PAM)
        AC_MSG_CHECKING([whether pam_strerror takes only one argument])
        AC_TRY_COMPILE(
                [
-                       #include <stdlib.h>
-                       #include <security/pam_appl.h>
+#include <stdlib.h>
+#include <security/pam_appl.h>
                ], 
                [(void)pam_strerror((pam_handle_t *)NULL, -1);], 
                [AC_MSG_RESULT(no)],
@@ -224,18 +219,18 @@ for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /
 
                AC_TRY_RUN(
                        [
-                               #include <openssl/rsa.h>
-                               #include <openssl/bn.h>
-                               #include <openssl/sha.h>
-                               int main(void) 
-                               {
-                                       RSA *key; char a[2048],b[2048];;
-                                       memset(a, 0, sizeof(a));memset(b, 0, sizeof(b));
-                                       RAND_add(a, sizeof(a), sizeof(a));
-                                       key=RSA_generate_key(32,3,NULL,NULL);
-                                       if (key==NULL) return(1);
-                                       return(-1==RSA_private_decrypt(RSA_size(key),a,b,key,RSA_NO_PADDING));
-                               }
+#include <openssl/rsa.h>
+#include <openssl/bn.h>
+#include <openssl/sha.h>
+int main(void) 
+{
+       RSA *key; char a[2048],b[2048];;
+       memset(a, 0, sizeof(a));memset(b, 0, sizeof(b));
+       RAND_add(a, sizeof(a), sizeof(a));
+       key=RSA_generate_key(32,3,NULL,NULL);
+       if (key==NULL) return(1);
+       return(-1==RSA_private_decrypt(RSA_size(key),a,b,key,RSA_NO_PADDING));
+}
                        ],
                        [
                                AC_DEFINE(HAVE_OPENSSL)
@@ -243,27 +238,6 @@ for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /
                                break;
                        ], []
                )
-               AC_TRY_RUN(
-                       [
-                               #include <ssl/rsa.h>
-                               #include <ssl/bn.h>
-                               #include <ssl/sha.h>
-                               int main(void) 
-                               {
-                                       RSA *key; char a[2048],b[2048];;
-                                       memset(a, 0, sizeof(a));memset(b, 0, sizeof(b));
-                                       RAND_seed(a, sizeof(a));
-                                       key=RSA_generate_key(32,3,NULL,NULL);
-                                       if (key==NULL) return(1);
-                                       return(-1==RSA_private_decrypt(RSA_size(key),a,b,key,RSA_NO_PADDING));
-                               }
-                       ],
-                       [
-                               AC_DEFINE(HAVE_SSL)
-                               found_crypto=1
-                               break;
-                       ], []
-               )
        done
 
        if test ! -z "$found_crypto" ; then
@@ -361,8 +335,8 @@ fi
 AC_MSG_CHECKING([for socklen_t])
 AC_TRY_COMPILE(
        [
-               #include <sys/types.h>
-               #include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/socket.h>
        ],
        [socklen_t foo; foo = 1235;],
        [
@@ -386,8 +360,8 @@ AC_TRY_COMPILE(
 AC_MSG_CHECKING([for struct sockaddr_storage])
 AC_TRY_COMPILE(
        [
-               #include <sys/types.h>
-               #include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/socket.h>
        ],
        [struct sockaddr_storage s;],
        [
@@ -422,9 +396,9 @@ AC_TRY_COMPILE(
 AC_MSG_CHECKING([for struct addrinfo])
 AC_TRY_COMPILE(
        [
-               #include <sys/types.h>
-               #include <sys/socket.h>
-               #include <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
        ],
        [struct addrinfo s; s.ai_flags = AI_PASSIVE;],
        [
@@ -494,8 +468,8 @@ AC_EGREP_HEADER(ut_addr_v6, utmpx.h,
 AC_MSG_CHECKING([whether struct sockaddr_storage has ss_family field])
 AC_TRY_COMPILE(
        [
-               #include <sys/types.h>
-               #include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/socket.h>
        ],
        [struct sockaddr_storage s; s.ss_family = 1;],
        [
@@ -507,8 +481,8 @@ AC_TRY_COMPILE(
 AC_MSG_CHECKING([whether struct sockaddr_storage has __ss_family field])
 AC_TRY_COMPILE(
        [
-               #include <sys/types.h>
-               #include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/socket.h>
        ],
        [struct sockaddr_storage s; s.__ss_family = 1;],
        [
@@ -662,6 +636,67 @@ AC_ARG_WITH(egd-pool,
        ]
 )
 
+if test -z "$RANDOM_POOL" -a -z "$EGD_SOCKET" ; then
+       # Use these commands to collect entropy
+       AC_PATH_PROG(PROG_LS, ls)
+       AC_PATH_PROG(PROG_NETSTAT, netstat)
+       AC_PATH_PROG(PROG_ARP, arp)
+       AC_PATH_PROG(PROG_IFCONFIG, ifconfig)
+       AC_PATH_PROG(PROG_PS, ps)
+       AC_PATH_PROG(PROG_W, w)
+       AC_PATH_PROG(PROG_WHO, who)
+       AC_PATH_PROG(PROG_LAST, last)
+       AC_PATH_PROG(PROG_LASTLOG, lastlog)
+       AC_PATH_PROG(PROG_DF, df)
+       AC_PATH_PROG(PROG_VMSTAT, vmstat)
+       AC_PATH_PROG(PROG_UPTIME, uptime)
+       AC_PATH_PROG(PROG_IPCS, ipcs)
+       AC_PATH_PROG(PROG_TAIL, tail)
+       AC_PATH_PROG(PROG_LS, ls)
+       if test ! -z "$PROG_LS" ; then 
+               AC_DEFINE_UNQUOTED(PROG_LS, "$PROG_LS") 
+       fi
+       if test ! -z "$PROG_NETSTAT" ; then 
+               AC_DEFINE_UNQUOTED(PROG_NETSTAT, "$PROG_NETSTAT") 
+       fi
+       if test ! -z "$PROG_ARP" ; then 
+               AC_DEFINE_UNQUOTED(PROG_ARP, "$PROG_ARP") 
+       fi
+       if test ! -z "$PROG_IFCONFIG" ; then 
+               AC_DEFINE_UNQUOTED(PROG_IFCONFIG, "$PROG_IFCONFIG") 
+       fi
+       if test ! -z "$PROG_PS" ; then 
+               AC_DEFINE_UNQUOTED(PROG_PS, "$PROG_PS") 
+       fi
+       if test ! -z "$PROG_W" ; then 
+               AC_DEFINE_UNQUOTED(PROG_W, "$PROG_W") 
+       fi
+       if test ! -z "$PROG_WHO" ; then 
+               AC_DEFINE_UNQUOTED(PROG_WHO, "$PROG_WHO") 
+       fi
+       if test ! -z "$PROG_LAST" ; then 
+               AC_DEFINE_UNQUOTED(PROG_LAST, "$PROG_LAST") 
+       fi
+       if test ! -z "$PROG_LASTLOG" ; then 
+               AC_DEFINE_UNQUOTED(PROG_LASTLOG, "$PROG_LASTLOG") 
+       fi
+       if test ! -z "$PROG_DF" ; then 
+               AC_DEFINE_UNQUOTED(PROG_DF, "$PROG_DF") 
+       fi
+       if test ! -z "$PROG_VMSTAT" ; then 
+               AC_DEFINE_UNQUOTED(PROG_VMSTAT, "$PROG_VMSTAT") 
+       fi
+       if test ! -z "$PROG_UPTIME" ; then 
+               AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME") 
+       fi
+       if test ! -z "$PROG_UPTIME" ; then
+               AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME") 
+       fi
+       if test ! -z "$PROG_TAIL" ; then
+               AC_DEFINE_UNQUOTED(PROG_TAIL, "$PROG_TAIL") 
+       fi
+fi
+
 AC_ARG_WITH(catman,
        [  --with-catman=man|cat   Install preformatted manpages[no]],
        [
@@ -765,7 +800,7 @@ AC_ARG_WITH(tcp-wrappers,
                        AC_MSG_CHECKING(for libwrap)
                        AC_TRY_LINK(
                                [
-                                       #include <tcpd.h>
+#include <tcpd.h>
                                        int deny_severity = 0, allow_severity = 0;
                                ],
                                [hosts_access(0);],
@@ -873,9 +908,24 @@ AC_ARG_WITH(pid-dir,
                fi
        ]
 )
+
 AC_DEFINE_UNQUOTED(PIDDIR, "$piddir")
 AC_SUBST(piddir)
 
+
+# Change default command timeout for builtin PRNG
+entropy_timeout=100
+AC_ARG_WITH(entropy-timeout,
+       [  --with-entropy-timeout  Specify entropy gathering command timeout (msec)],
+       [
+               if test "x$withval" != "xno" ; then
+                       entropy_timeout=$withval
+               fi
+       ]       
+)
+AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout)
+
+
 if test ! -z "$blibpath" ; then
        LDFLAGS="$LDFLAGS -blibpath:$blibpath"
        AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile])
This page took 0.051442 seconds and 4 git commands to generate.