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)
downloadopenssh-git-0800647391ac42dea364e409100e8961686fae34.tar.gz
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 83759ca6..d8eba654 100644
--- a/entropy.c
+++ b/entropy.c
@@ -35,7 +35,7 @@
#include <openssl/rand.h>
#include <openssl/sha.h>
-RCSID("$Id: entropy.c,v 1.15 2000/06/26 03:01:33 djm Exp $");
+RCSID("$Id: entropy.c,v 1.16 2000/06/26 03:55:31 djm Exp $");
#ifndef offsetof
# define offsetof(type, member) ((size_t) &((type *)0)->member)
@@ -158,11 +158,13 @@ seed_rng(void)
debug("Seeding random number generator");
- if (!get_random_bytes(buf, sizeof(buf)) && !RAND_status())
- fatal("Entropy collection failed and entropy exhausted");
-
- RAND_add(buf, sizeof(buf), sizeof(buf));
-
+ if (!get_random_bytes(buf, sizeof(buf))) {
+ if (!RAND_status())
+ fatal("Entropy collection failed and entropy exhausted");
+ } else {
+ RAND_add(buf, sizeof(buf), sizeof(buf));
+ }
+
memset(buf, '\0', sizeof(buf));
}