aboutsummaryrefslogtreecommitdiff
path: root/sys/libkern/arc4random.c
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2013-04-19 00:30:52 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2013-04-19 00:30:52 +0000
commit2b50ce65be6c97b3507d45275133df39e95752e8 (patch)
treefa25310a8dd89ca7a6e6ae0ff9bec9876bb60c74 /sys/libkern/arc4random.c
parent64a0e848abbc491831a2969e72ecfb6a0ae9716c (diff)
Notes
Diffstat (limited to 'sys/libkern/arc4random.c')
-rw-r--r--sys/libkern/arc4random.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/libkern/arc4random.c b/sys/libkern/arc4random.c
index 4fcd74d814ec..62ace2cb5985 100644
--- a/sys/libkern/arc4random.c
+++ b/sys/libkern/arc4random.c
@@ -24,6 +24,8 @@ __FBSDID("$FreeBSD$");
#define ARC4_RESEED_SECONDS 300
#define ARC4_KEYBYTES (256 / 8)
+int arc4rand_iniseed_state = ARC4_ENTR_NONE;
+
static u_int8_t arc4_i, arc4_j;
static int arc4_numruns = 0;
static u_int8_t arc4_sbox[256];
@@ -130,7 +132,8 @@ arc4rand(void *ptr, u_int len, int reseed)
struct timeval tv;
getmicrouptime(&tv);
- if (reseed ||
+ if (atomic_cmpset_int(&arc4rand_iniseed_state, ARC4_ENTR_HAVE,
+ ARC4_ENTR_SEED) || reseed ||
(arc4_numruns > ARC4_RESEED_BYTES) ||
(tv.tv_sec > arc4_t_reseed))
arc4_randomstir();