- (djm) Ignore fix & patchlevel in OpenSSL version check. Patch from
solar@openwall.com
- (djm) Rework entropy code. If the OpenSSL PRNG is has not been
internally seeded, execute a subprogram "ssh-rand-helper" to obtain
some entropy for us. Rewrite the old in-process entropy collecter as
an example ssh-rand-helper.
- (djm) Always perform ssh_prng_cmds path lookups in configure, even if
we don't end up using ssh_prng_cmds (so we always get a valid file)
diff --git a/configure.ac b/configure.ac
index ae2b6a7..35cda59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.6 2001/12/07 17:20:48 mouring Exp $
+i# $Id: configure.ac,v 1.7 2001/12/23 14:41:48 djm Exp $
AC_INIT
AC_CONFIG_SRCDIR([ssh.c])
@@ -1598,28 +1598,28 @@
INSTALL_SSH_PRNG_CMDS=""
rm -f prng_commands
if (test -z "$RANDOM_POOL" && test -z "$PRNGD") ; then
- # Use these commands to collect entropy
- OSSH_PATH_ENTROPY_PROG(PROG_LS, ls)
- OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat)
- OSSH_PATH_ENTROPY_PROG(PROG_ARP, arp)
- OSSH_PATH_ENTROPY_PROG(PROG_IFCONFIG, ifconfig)
- OSSH_PATH_ENTROPY_PROG(PROG_JSTAT, jstat)
- OSSH_PATH_ENTROPY_PROG(PROG_PS, ps)
- OSSH_PATH_ENTROPY_PROG(PROG_SAR, sar)
- OSSH_PATH_ENTROPY_PROG(PROG_W, w)
- OSSH_PATH_ENTROPY_PROG(PROG_WHO, who)
- OSSH_PATH_ENTROPY_PROG(PROG_LAST, last)
- OSSH_PATH_ENTROPY_PROG(PROG_LASTLOG, lastlog)
- OSSH_PATH_ENTROPY_PROG(PROG_DF, df)
- OSSH_PATH_ENTROPY_PROG(PROG_VMSTAT, vmstat)
- OSSH_PATH_ENTROPY_PROG(PROG_UPTIME, uptime)
- OSSH_PATH_ENTROPY_PROG(PROG_IPCS, ipcs)
- OSSH_PATH_ENTROPY_PROG(PROG_TAIL, tail)
-
INSTALL_SSH_PRNG_CMDS="yes"
fi
AC_SUBST(INSTALL_SSH_PRNG_CMDS)
+# These programs are used to gather entropy from
+OSSH_PATH_ENTROPY_PROG(PROG_LS, ls)
+OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat)
+OSSH_PATH_ENTROPY_PROG(PROG_ARP, arp)
+OSSH_PATH_ENTROPY_PROG(PROG_IFCONFIG, ifconfig)
+OSSH_PATH_ENTROPY_PROG(PROG_JSTAT, jstat)
+OSSH_PATH_ENTROPY_PROG(PROG_PS, ps)
+OSSH_PATH_ENTROPY_PROG(PROG_SAR, sar)
+OSSH_PATH_ENTROPY_PROG(PROG_W, w)
+OSSH_PATH_ENTROPY_PROG(PROG_WHO, who)
+OSSH_PATH_ENTROPY_PROG(PROG_LAST, last)
+OSSH_PATH_ENTROPY_PROG(PROG_LASTLOG, lastlog)
+OSSH_PATH_ENTROPY_PROG(PROG_DF, df)
+OSSH_PATH_ENTROPY_PROG(PROG_VMSTAT, vmstat)
+OSSH_PATH_ENTROPY_PROG(PROG_UPTIME, uptime)
+OSSH_PATH_ENTROPY_PROG(PROG_IPCS, ipcs)
+OSSH_PATH_ENTROPY_PROG(PROG_TAIL, tail)
+
AC_ARG_WITH(mantype,
[ --with-mantype=man|cat|doc Set man page type],