Fri Mar 25 22:13:23 2016 UTC ()

KNF


(riastradh)

diff -r1.30 -r1.31 src/lib/libc/gen/arc4random.c

--- src/lib/libc/gen/arc4random.c 2015/05/13 23:15:57	1.30
+++ src/lib/libc/gen/arc4random.c 2016/03/25 22:13:23	1.31

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -42,27 +42,27 @@
+ *
  * The arc4random(3) API may abort the process if:
+ *
  * (a) the crypto self-test fails,
  * (b) pthread_atfork or thr_keycreate fail, or
  * (c) sysctl(KERN_ARND) fails when reseeding the PRNG.
+ *
  * The crypto self-test, pthread_atfork, and thr_keycreate occur only
  * once, on the first use of any of the arc4random(3) API.  KERN_ARND
  * is unlikely to fail later unless the kernel is seriously broken.
  */
 #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"
 #include <sys/bitops.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/mman.h>
 #include <sys/sysctl.h>
 #include <assert.h>
 #include <sha2.h>
 #include <stdbool.h>
 @@ -346,27 +346,28 @@ crypto_onetimestream(const void *seed, v
 	/*
 	 * Guarantee we can generate up to n bytes.  We have
 	 * 2^(8*INPUTBYTES) possible inputs yielding output of
 	 * OUTPUTBYTES*2^(8*INPUTBYTES) bytes.  It suffices to require
 	 * that sizeof n > (1/CHAR_BIT) log_2 n be less than
 	 * (1/CHAR_BIT) log_2 of the total output stream length.  We
 	 * have
+	 *
 	 *	log_2 (o 2^(8 i)) = log_2 o + log_2 2^(8 i)
 	 *	  = log_2 o + 8 i.
 	 */
 	__CTASSERT(CHAR_BIT * sizeof n <=
-	    (/*LINTED*/ilog2(crypto_core_OUTPUTBYTES) + 8 * crypto_core_INPUTBYTES));
+	    (/*LINTED*/ilog2(crypto_core_OUTPUTBYTES) +
 *crypto_core_INPUTBYTES));
 	p8 = buf;
 	p32 = (uint8_t *)roundup2((uintptr_t)p8, 4);
 	ni = p32 - p8;
 	if (n < ni)
 		ni = n;
 	nb = (n - ni) / sizeof block;
 	nf = (n - ni) % sizeof block;
 	_DIAGASSERT(((uintptr_t)p32 & 3) == 0);
 	_DIAGASSERT(ni <= n);
 	_DIAGASSERT(nb <= (n / sizeof block));
 	_DIAGASSERT(nf <= n);
 @@ -434,27 +435,28 @@ arc4random_prng_addrandom(struct arc4ran
 	/* reseed(SHA256(prng() || sysctl(KERN_ARND) || data)) */
 	crypto_prng_seed(&prng->arc4_prng, buf);
 	(void)explicit_memset(buf, 0, sizeof buf);
 	prng->arc4_seeded = true;
+}
 #ifdef _REENTRANT
 static struct arc4random_prng *
 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,
 );
 	if (prng == MAP_FAILED)
 		goto fail0;
 	if (minherit(prng, size, MAP_INHERIT_ZERO) == -1)
 		goto fail1;
 	return prng;
 fail1:	(void)munmap(prng, size);
 fail0:	return NULL;
+}
 #endif
 #ifdef _REENTRANT