From eb012ac581fd0abc16ee86ee3a68cf07c8ce4d08 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 11 Jun 2014 13:10:00 +1000 Subject: - (dtucker) [openbsd-compat/arc4random.c] Use explicit_bzero instead of an assigment that might get optimized out. ok djm@ --- openbsd-compat/arc4random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openbsd-compat/arc4random.c') diff --git a/openbsd-compat/arc4random.c b/openbsd-compat/arc4random.c index eac073cc0..fa0d6301a 100644 --- a/openbsd-compat/arc4random.c +++ b/openbsd-compat/arc4random.c @@ -229,7 +229,7 @@ arc4random_buf(void *_buf, size_t n) buf[i] = r & 0xff; r >>= 8; } - i = r = 0; + explicit_bzero(&r, sizeof(r)); } #endif /* !defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_ARC4RANDOM) */ -- cgit v1.2.3 From 2a8699f37cc2515e3bc60e0c677ba060f4d48191 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 4 Sep 2014 03:46:05 +1000 Subject: - (djm) [openbsd-compat/arc4random.c] Zero seed after keying PRNG --- ChangeLog | 3 +++ openbsd-compat/arc4random.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'openbsd-compat/arc4random.c') diff --git a/ChangeLog b/ChangeLog index 829de3656..573968886 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +20140904 + - (djm) [openbsd-compat/arc4random.c] Zero seed after keying PRNG + 20140903 - (djm) [defines.h sshbuf.c] Move __predict_true|false to defines.h and conditionalise to avoid duplicate definition. diff --git a/openbsd-compat/arc4random.c b/openbsd-compat/arc4random.c index fa0d6301a..09dbfda16 100644 --- a/openbsd-compat/arc4random.c +++ b/openbsd-compat/arc4random.c @@ -87,7 +87,7 @@ _rs_stir(void) _rs_init(rnd, sizeof(rnd)); } else _rs_rekey(rnd, sizeof(rnd)); - memset(rnd, 0, sizeof(rnd)); + explicit_bzero(rnd, sizeof(rnd)); /* invalidate rs_buf */ rs_have = 0; -- cgit v1.2.3