Module Name: src
Committed By: riastradh
Date: Mon Apr 13 22:43:41 UTC 2015
Modified Files:
src/sys/crypto/cprng_fast: cprng_fast.c
src/sys/dev: rnd_private.h
src/sys/kern: kern_rndpool.c kern_rndq.c kern_rndsink.c subr_cprng.c
Log Message:
More rnd.h user cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/crypto/cprng_fast/cprng_fast.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/rnd_private.h
cvs rdiff -u -r1.8 -r1.9 src/sys/kern/kern_rndpool.c
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.12 -r1.13 src/sys/kern/kern_rndsink.c
cvs rdiff -u -r1.26 -r1.27 src/sys/kern/subr_cprng.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/crypto/cprng_fast/cprng_fast.c
diff -u src/sys/crypto/cprng_fast/cprng_fast.c:1.12 src/sys/crypto/cprng_fast/cprng_fast.c:1.13
--- src/sys/crypto/cprng_fast/cprng_fast.c:1.12 Mon Apr 13 15:51:00 2015
+++ src/sys/crypto/cprng_fast/cprng_fast.c Mon Apr 13 22:43:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cprng_fast.c,v 1.12 2015/04/13 15:51:00 riastradh Exp $ */
+/* $NetBSD: cprng_fast.c,v 1.13 2015/04/13 22:43:41 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cprng_fast.c,v 1.12 2015/04/13 15:51:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cprng_fast.c,v 1.13 2015/04/13 22:43:41 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: cprng_fast.c
#include <sys/cpu.h>
#include <sys/intr.h>
#include <sys/percpu.h>
-#include <sys/rnd.h>
+#include <sys/rnd.h> /* rnd_initial_entropy */
/* ChaCha core */
Index: src/sys/dev/rnd_private.h
diff -u src/sys/dev/rnd_private.h:1.7 src/sys/dev/rnd_private.h:1.8
--- src/sys/dev/rnd_private.h:1.7 Mon Apr 13 15:13:50 2015
+++ src/sys/dev/rnd_private.h Mon Apr 13 22:43:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd_private.h,v 1.7 2015/04/13 15:13:50 riastradh Exp $ */
+/* $NetBSD: rnd_private.h,v 1.8 2015/04/13 22:43:41 riastradh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -36,7 +36,9 @@
#include <sys/types.h>
#include <sys/mutex.h>
#include <sys/queue.h>
-#include <sys/rnd.h>
+#include <sys/rndio.h>
+#include <sys/rndsource.h>
+#include <sys/rndpool.h>
/*
* Number of bytes returned per hash. This value is used in both
Index: src/sys/kern/kern_rndpool.c
diff -u src/sys/kern/kern_rndpool.c:1.8 src/sys/kern/kern_rndpool.c:1.9
--- src/sys/kern/kern_rndpool.c:1.8 Wed Apr 8 13:45:01 2015
+++ src/sys/kern/kern_rndpool.c Mon Apr 13 22:43:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndpool.c,v 1.8 2015/04/08 13:45:01 riastradh Exp $ */
+/* $NetBSD: kern_rndpool.c,v 1.9 2015/04/13 22:43:41 riastradh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,13 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.8 2015/04/08 13:45:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.9 2015/04/13 22:43:41 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sha1.h>
-#include <sys/rnd.h>
+#include <sys/rndpool.h>
#include <dev/rnd_private.h>
/*
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.46 src/sys/kern/kern_rndq.c:1.47
--- src/sys/kern/kern_rndq.c:1.46 Mon Apr 13 15:23:01 2015
+++ src/sys/kern/kern_rndq.c Mon Apr 13 22:43:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.46 2015/04/13 15:23:01 riastradh Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.47 2015/04/13 22:43:41 riastradh Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.46 2015/04/13 15:23:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.47 2015/04/13 22:43:41 riastradh Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -49,7 +49,9 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,
#include <sys/callout.h>
#include <sys/intr.h>
#include <sys/rnd.h>
+#include <sys/rndpool.h>
#include <sys/rndsink.h>
+#include <sys/rndsource.h>
#include <sys/vnode.h>
#include <sys/pool.h>
#include <sys/kauth.h>
Index: src/sys/kern/kern_rndsink.c
diff -u src/sys/kern/kern_rndsink.c:1.12 src/sys/kern/kern_rndsink.c:1.13
--- src/sys/kern/kern_rndsink.c:1.12 Mon Apr 13 15:13:50 2015
+++ src/sys/kern/kern_rndsink.c Mon Apr 13 22:43:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndsink.c,v 1.12 2015/04/13 15:13:50 riastradh Exp $ */
+/* $NetBSD: kern_rndsink.c,v 1.13 2015/04/13 22:43:41 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndsink.c,v 1.12 2015/04/13 15:13:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndsink.c,v 1.13 2015/04/13 22:43:41 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rndsink
#include <sys/kmem.h>
#include <sys/mutex.h>
#include <sys/queue.h>
-#include <sys/rnd.h>
#include <sys/rndsink.h>
#include <dev/rnd_private.h>
Index: src/sys/kern/subr_cprng.c
diff -u src/sys/kern/subr_cprng.c:1.26 src/sys/kern/subr_cprng.c:1.27
--- src/sys/kern/subr_cprng.c:1.26 Wed Nov 19 14:25:00 2014
+++ src/sys/kern/subr_cprng.c Mon Apr 13 22:43:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cprng.c,v 1.26 2014/11/19 14:25:00 christos Exp $ */
+/* $NetBSD: subr_cprng.c,v 1.27 2015/04/13 22:43:41 riastradh Exp $ */
/*-
* Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.26 2014/11/19 14:25:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.27 2015/04/13 22:43:41 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_cprng.c
#include <sys/select.h>
#include <sys/systm.h>
#include <sys/sysctl.h>
-#include <sys/rnd.h>
#include <sys/rndsink.h>
#if DIAGNOSTIC
#include <sys/rngtest.h>
