This is the much-discussed major upgrade to the random(4) device, known to you all as /dev/random.

This code has had an extensive rewrite and a good series of reviews, both by the author and other parties. This means a lot of code has been simplified. Pluggable structures for high-rate entropy generators are available, and it is most definitely not the case that /dev/random can be driven by only a hardware souce any more. This has been designed out of the device. Hardware sources are stirred into the CSPRNG (Yarrow, Fortuna) like any other entropy source. Pluggable modules may be written by third parties for additional sources.

The harvesting structures and consequently the locking have been simplified. Entropy harvesting is done in a more general way (the documentation for this will follow). There is some GREAT entropy to be had in the UMA allocator, but it is disabled for now as messing with that is likely to annoy many people.

The venerable (but effective) Yarrow algorithm, which is no longer supported by its authors now has an alternative, Fortuna. For now, Yarrow is retained as the default algorithm, but this may be changed using a kernel option. It is intended to make Fortuna the default algorithm for 11.0. Interested parties are encouraged to read ISBN 978-0-470-47424-2 "Cryptography Engineering" By Ferguson, Schneier and Kohno for Fortuna's gory details. Heck, read it anyway.

Many thanks to Arthur Mesh who did early grunt work, and who got caught in the crossfire rather more than he deserved to.

My thanks also to folks who helped me thresh this out on whiteboards and in the odd "Hallway track", or otherwise.

My Nomex pants are on. Let the feedback commence!

Reviewed by:	trasz,des(partial),imp(partial?),rwatson(partial?)
Approved by:	so(des)

5 files changed, 3 insertions, 65 deletions

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 2a3057f..72b5247 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -57,7 +57,6 @@ FILES=	DAEMON \
 	hostid_save \
 	hostname \
 	inetd \
-	initrandom \
 	ip6addrctl \
 	ipfilter \
 	ipfs \
diff --git a/etc/rc.d/geli b/etc/rc.d/geli
index 8b867b3..4551f71 100755
--- a/etc/rc.d/geli
+++ b/etc/rc.d/geli
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: disks
-# REQUIRE: initrandom
+# REQUIRE: random
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/etc/rc.d/initrandom b/etc/rc.d/initrandom
deleted file mode 100755
index 907668b..0000000
--- a/etc/rc.d/initrandom
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: initrandom
-# REQUIRE: dumpon ddb
-# BEFORE: disks
-# KEYWORD: nojail
-
-. /etc/rc.subr
-
-name="initrandom"
-start_cmd="initrandom_start"
-stop_cmd=":"
-
-initrandom_start()
-{
-	soft_random_generator=`sysctl kern.random 2>/dev/null`
-
-	echo -n 'Entropy harvesting:'
-
-	if [ \! -z "${soft_random_generator}" ] ; then
-
-		if [ -w /dev/random ]; then
-			if checkyesno harvest_interrupt; then
-				${SYSCTL} kern.random.sys.harvest.interrupt=1 >/dev/null
-				echo -n ' interrupts'
-			else
-				${SYSCTL} kern.random.sys.harvest.interrupt=0 >/dev/null
-			fi
-
-			if checkyesno harvest_ethernet; then
-				${SYSCTL} kern.random.sys.harvest.ethernet=1 >/dev/null
-				echo -n ' ethernet'
-			else
-				${SYSCTL} kern.random.sys.harvest.ethernet=0 >/dev/null
-			fi
-
-			if checkyesno harvest_p_to_p; then
-				${SYSCTL} kern.random.sys.harvest.point_to_point=1 >/dev/null
-				echo -n ' point_to_point'
-			else
-				${SYSCTL} kern.random.sys.harvest.point_to_point=0 >/dev/null
-			fi
-
-			if checkyesno harvest_swi; then
-				${SYSCTL} kern.random.sys.harvest.swi=1 >/dev/null
-				echo -n ' swi'
-			else
-				${SYSCTL} kern.random.sys.harvest.swi=0 >/dev/null
-			fi
-		fi
-
-	fi
-
-	echo '.'
-}
-
-load_rc_config random
-run_rc_command "$1"
diff --git a/etc/rc.d/postrandom b/etc/rc.d/postrandom
index 006d563..3a60830 100755
--- a/etc/rc.d/postrandom
+++ b/etc/rc.d/postrandom
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: postrandom
-# REQUIRE: initrandom random FILESYSTEMS
+# REQUIRE: random FILESYSTEMS
 # BEFORE: LOGIN
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/random b/etc/rc.d/random
index 8499522..c7da932 100755
--- a/etc/rc.d/random
+++ b/etc/rc.d/random
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: random
-# REQUIRE: initrandom FILESYSTEMS
+# REQUIRE: FILESYSTEMS
 # BEFORE: netif
 # KEYWORD: nojail shutdown