summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2002-05-08 15:57:18 -0700
committerTim Rice <tim@multitalents.net>2002-05-08 15:57:18 -0700
commit63cf84199df312830144db03f8defd88168335a0 (patch)
treeaf3b93882e58a5beeba73c6a03d9bcadb5ad7ed0
parent4bd2a1989073dcf353e8e4801029f9b6873158df (diff)
fix logic on when seed_rng() is called.
Report by Chris Maxwell <maxwell@cs.dal.ca>
-rw-r--r--ChangeLog6
-rw-r--r--openbsd-compat/bsd-arc4random.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index be9e70684..ecb62d8cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
120020507 120020507
2 - (tim) [openbsd-compat/bsd-arc4random.c] fix logic on when seed_rng() is
3 called. Report by Chris Maxwell <maxwell@cs.dal.ca>
4
520020507
2 - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] 6 - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
3 Add truncate() emulation to address Bug 208 7 Add truncate() emulation to address Bug 208
4 8
@@ -539,4 +543,4 @@
539 - (stevesk) entropy.c: typo in debug message 543 - (stevesk) entropy.c: typo in debug message
540 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 544 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
541 545
542$Id: ChangeLog,v 1.2096 2002/05/08 02:51:31 tim Exp $ 546$Id: ChangeLog,v 1.2097 2002/05/08 22:57:18 tim Exp $
diff --git a/openbsd-compat/bsd-arc4random.c b/openbsd-compat/bsd-arc4random.c
index aaf9a7b0b..ab4e1431e 100644
--- a/openbsd-compat/bsd-arc4random.c
+++ b/openbsd-compat/bsd-arc4random.c
@@ -25,7 +25,7 @@
25#include "includes.h" 25#include "includes.h"
26#include "log.h" 26#include "log.h"
27 27
28RCSID("$Id: bsd-arc4random.c,v 1.4 2001/03/18 23:00:53 djm Exp $"); 28RCSID("$Id: bsd-arc4random.c,v 1.5 2002/05/08 22:57:18 tim Exp $");
29 29
30#ifndef HAVE_ARC4RANDOM 30#ifndef HAVE_ARC4RANDOM
31 31
@@ -48,7 +48,7 @@ unsigned int arc4random(void)
48 static int first_time = 1; 48 static int first_time = 1;
49 49
50 if (rc4_ready <= 0) { 50 if (rc4_ready <= 0) {
51 if (!first_time) 51 if (first_time)
52 seed_rng(); 52 seed_rng();
53 first_time = 0; 53 first_time = 0;
54 arc4random_stir(); 54 arc4random_stir();