- Generate manpages before make install not at the end of make all

 - Don't seed the rng quite so often
 - Always reseed rng when requested

diff --git a/ChangeLog b/ChangeLog
index 906e09f0456838cc3092dd9ca8300e5fc659c204..33e522843e3a3931e4a9993cd99e0f0578cea95d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
      channel layer support for ssh2
    - [kex.h kex.c hmac.h hmac.c dsa.c dsa.h]
      DSA, keyexchange, algorithm agreement for ssh2
+ - Generate manpages before make install not at the end of make all
+ - Don't seed the rng quite so often
+ - Always reseed rng when requested
 
 20000403
  - Wrote entropy collection routines for systems that lack /dev/random

diff --git a/Makefile.in b/Makefile.in
index bb08b53b9dae34685ba3084c9690764ad9a80f6d..196cc5786837fe49b74616644266fa72525c8b41 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,9 @@ PATHSUBS      = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/known_hosts=$(sysco
 
 FIXPATHSCMD    = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
 
-all: $(TARGETS) $(MANPAGES) $(CONFIGFILES)
+all: $(TARGETS) $(CONFIGFILES)
+
+manpages: $(MANPAGES)
 
 $(LIBOBJS): config.h
 
@@ -95,7 +97,7 @@ catman-do:
                        >$${f%%.[18]}.0 ; \
        done
 
-install: $(TARGETS)
+install: manpages $(TARGETS)
        $(INSTALL) -d $(DESTDIR)$(bindir)
        $(INSTALL) -d $(DESTDIR)$(sbindir)
        $(INSTALL) -d $(DESTDIR)$(mandir)

diff --git a/entropy.c b/entropy.c
index cd6f1a508e3e0e6eb3585d2a7b3e5a3c114963de..94e7dcec1a0ea5007f838314c302e0c43aaf839f 100644 (file)
--- a/entropy.c
+++ b/entropy.c
@@ -41,7 +41,7 @@
 # include <ssl/sha.h>
 #endif
 
-RCSID("$Id: entropy.c,v 1.2 2000/04/03 05:07:32 damien Exp $");
+RCSID("$Id: entropy.c,v 1.3 2000/04/04 05:04:10 damien Exp $");
 
 #ifdef EGD_SOCKET
 #ifndef offsetof
@@ -424,11 +424,10 @@ seed_rng(void)
 void
 seed_rng(void)
 {
-       if (!RAND_status()) {
-               debug("Seeding random number generator.");
-               debug("%i bytes from system calls", (int)stir_from_system());
-               debug("%i bytes from programs", (int)stir_from_programs());
-               debug("OpenSSL random status is now %i\n", RAND_status());
-       }
+       debug("Seeding random number generator.");
+       debug("OpenSSL random status is now %i\n", RAND_status());
+       debug("%i bytes from system calls", (int)stir_from_system());
+       debug("%i bytes from programs", (int)stir_from_programs());
+       debug("OpenSSL random status is now %i\n", RAND_status());
 }
 #endif /* defined(EGD_SOCKET) || defined(RANDOM_POOL) */