summaryrefslogtreecommitdiff
path: root/entropy.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-06-26 13:55:31 +1000
committerDamien Miller <djm@mindrot.org>2000-06-26 13:55:31 +1000
commit0800647391ac42dea364e409100e8961686fae34 (patch)
treebc45713407dbb3cc93275650164bd952239efba3 /entropy.c
parent7a445bb8d887b3ecf51ef24f582ed18d07c3793b (diff)
Fix fixed egd code
Diffstat (limited to 'entropy.c')
-rw-r--r--entropy.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/entropy.c b/entropy.c
index 83759ca65..d8eba6547 100644
--- a/entropy.c
+++ b/entropy.c
@@ -35,7 +35,7 @@
35#include <openssl/rand.h> 35#include <openssl/rand.h>
36#include <openssl/sha.h> 36#include <openssl/sha.h>
37 37
38RCSID("$Id: entropy.c,v 1.15 2000/06/26 03:01:33 djm Exp $"); 38RCSID("$Id: entropy.c,v 1.16 2000/06/26 03:55:31 djm Exp $");
39 39
40#ifndef offsetof 40#ifndef offsetof
41# define offsetof(type, member) ((size_t) &((type *)0)->member) 41# define offsetof(type, member) ((size_t) &((type *)0)->member)
@@ -158,11 +158,13 @@ seed_rng(void)
158 158
159 debug("Seeding random number generator"); 159 debug("Seeding random number generator");
160 160
161 if (!get_random_bytes(buf, sizeof(buf)) && !RAND_status()) 161 if (!get_random_bytes(buf, sizeof(buf))) {
162 fatal("Entropy collection failed and entropy exhausted"); 162 if (!RAND_status())
163 163 fatal("Entropy collection failed and entropy exhausted");
164 RAND_add(buf, sizeof(buf), sizeof(buf)); 164 } else {
165 165 RAND_add(buf, sizeof(buf), sizeof(buf));
166 }
167
166 memset(buf, '\0', sizeof(buf)); 168 memset(buf, '\0', sizeof(buf));
167} 169}
168 170