summaryrefslogtreecommitdiff
path: root/arc4random.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-08-19 10:05:14 -0400
committerNick Mathewson <nickm@torproject.org>2013-08-19 10:05:14 -0400
commit3807a30b03ab42f2f503f2db62b1ef5876e2be80 (patch)
tree35f89ace62cb76dd7bae62c725deab5f53bf102e /arc4random.c
parentc149a1a5e74a17febd6c0bf9af00b80104a5c3ed (diff)
parentc83efb801fefe4e10211c1a1d02ecd123926fb8c (diff)
downloadlibevent-3807a30b03ab42f2f503f2db62b1ef5876e2be80.tar.gz
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts: util-internal.h
Diffstat (limited to 'arc4random.c')
-rw-r--r--arc4random.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arc4random.c b/arc4random.c
index 02c892f9..a2338e69 100644
--- a/arc4random.c
+++ b/arc4random.c
@@ -162,7 +162,7 @@ arc4_seed_win32(void)
if (!CryptGenRandom(provider, sizeof(buf), buf))
return -1;
arc4_addrandom(buf, sizeof(buf));
- memset(buf, 0, sizeof(buf));
+ evutil_memclear_(buf, sizeof(buf));
arc4_seeded_ok = 1;
return 0;
}
@@ -200,7 +200,7 @@ arc4_seed_sysctl_linux(void)
return -1;
arc4_addrandom(buf, sizeof(buf));
- memset(buf, 0, sizeof(buf));
+ evutil_memclear_(buf, sizeof(buf));
arc4_seeded_ok = 1;
return 0;
}
@@ -240,7 +240,7 @@ arc4_seed_sysctl_bsd(void)
return -1;
arc4_addrandom(buf, sizeof(buf));
- memset(buf, 0, sizeof(buf));
+ evutil_memclear_(buf, sizeof(buf));
arc4_seeded_ok = 1;
return 0;
}
@@ -285,8 +285,8 @@ arc4_seed_proc_sys_kernel_random_uuid(void)
arc4_addrandom(entropy, nybbles/2);
bytes += nybbles/2;
}
- memset(entropy, 0, sizeof(entropy));
- memset(buf, 0, sizeof(buf));
+ evutil_memclear_(entropy, sizeof(entropy));
+ evutil_memclear_(buf, sizeof(buf));
arc4_seeded_ok = 1;
return 0;
}
@@ -310,7 +310,7 @@ static int arc4_seed_urandom_helper_(const char *fname)
if (n != sizeof(buf))
return -1;
arc4_addrandom(buf, sizeof(buf));
- memset(buf, 0, sizeof(buf));
+ evutil_memclear_(buf, sizeof(buf));
arc4_seeded_ok = 1;
return 0;
}