From owner-svn-src-head@freebsd.org  Sun Jul 19 16:05:27 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BDB119A5E64;
 Sun, 19 Jul 2015 16:05:27 +0000 (UTC)
 (envelope-from markm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AE37B1616;
 Sun, 19 Jul 2015 16:05:27 +0000 (UTC)
 (envelope-from markm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6JG5RlA038529;
 Sun, 19 Jul 2015 16:05:27 GMT (envelope-from markm@FreeBSD.org)
Received: (from markm@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6JG5RGk038528;
 Sun, 19 Jul 2015 16:05:27 GMT (envelope-from markm@FreeBSD.org)
Message-Id: <201507191605.t6JG5RGk038528@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markm set sender to
 markm@FreeBSD.org using -f
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 19 Jul 2015 16:05:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285691 - head/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jul 2015 16:05:27 -0000

Author: markm
Date: Sun Jul 19 16:05:26 2015
New Revision: 285691
URL: https://svnweb.freebsd.org/changeset/base/285691

Log:
  Clarify the intent of the RANDOM_* options.
  
  Approved by:	so (/dev/random blanket)

Modified:
  head/sys/conf/NOTES

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Sun Jul 19 16:05:23 2015	(r285690)
+++ head/sys/conf/NOTES	Sun Jul 19 16:05:26 2015	(r285691)
@@ -2982,8 +2982,10 @@ options 	MAXFILES=999
 # Random number generator
 # Only ONE of the below two may be used; they are mutually exclusive.
 # If neither is present, then the Fortuna algorithm is used.
-options 	RANDOM_YARROW	# Yarrow CSPRNG (Default)
-options 	RANDOM_DEBUG	# Debugging messages
+options 	RANDOM_YARROW	# Yarrow CSPRNG (old default)
+#options 	RANDOM_DUMMY	# Dummy CSPRNG that always blocks
+# For developers.
+options 	RANDOM_DEBUG	# Extra debugging messages
 
 # Module to enable execution of application via emulators like QEMU
 options         IMAGACT_BINMISC