This commit is contained in:
riastradh 2016-03-25 22:13:23 +00:00
parent 01ff6a8d1b
commit bec9c2fe3c
1 changed files with 6 additions and 4 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: arc4random.c,v 1.30 2015/05/13 23:15:57 justin Exp $ */
/* $NetBSD: arc4random.c,v 1.31 2016/03/25 22:13:23 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: arc4random.c,v 1.30 2015/05/13 23:15:57 justin Exp $");
__RCSID("$NetBSD: arc4random.c,v 1.31 2016/03/25 22:13:23 riastradh Exp $");
#include "namespace.h"
#include "reentrant.h"
@ -356,7 +356,8 @@ crypto_onetimestream(const void *seed, void *buf, size_t n)
* = log_2 o + 8 i.
*/
__CTASSERT(CHAR_BIT * sizeof n <=
(/*LINTED*/ilog2(crypto_core_OUTPUTBYTES) + 8 * crypto_core_INPUTBYTES));
(/*LINTED*/ilog2(crypto_core_OUTPUTBYTES) +
8*crypto_core_INPUTBYTES));
p8 = buf;
p32 = (uint8_t *)roundup2((uintptr_t)p8, 4);
@ -444,7 +445,8 @@ arc4random_prng_create(void)
struct arc4random_prng *prng;
const size_t size = roundup(sizeof(*prng), sysconf(_SC_PAGESIZE));
prng = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
prng = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1,
0);
if (prng == MAP_FAILED)
goto fail0;
if (minherit(prng, size, MAP_INHERIT_ZERO) == -1)