diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-02-08 22:24:51 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-02-08 22:24:51 -0500 |
commit | 9f5bf6639625f66055c1858551dd6d2208809ce6 (patch) | |
tree | 26a124f9f94e62850daf24643372c83ae84963ea /arc4random.c | |
parent | 4cb3f53a6bb26376e547ad14bf4fb17c7731a309 (diff) | |
parent | f73619808622c6267aee1ee6cbeb35e2d02c460f (diff) | |
download | libevent-9f5bf6639625f66055c1858551dd6d2208809ce6.tar.gz |
Merge remote branch 'origin/patches-2.0'
Diffstat (limited to 'arc4random.c')
-rw-r--r-- | arc4random.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arc4random.c b/arc4random.c index 045b9d2a..de93d6e4 100644 --- a/arc4random.c +++ b/arc4random.c @@ -353,7 +353,7 @@ arc4_seed(void) return ok ? 0 : -1; } -static void +static int arc4_stir(void) { int i; @@ -364,6 +364,8 @@ arc4_stir(void) } arc4_seed(); + if (!arc4_seeded_ok) + return -1; /* * Discard early keystream, as per recommendations in @@ -386,6 +388,8 @@ arc4_stir(void) for (i = 0; i < 12*256; i++) (void)arc4_getbyte(); arc4_count = BYTES_BEFORE_RESEED; + + return 0; } |