From owner-svn-src-projects@FreeBSD.ORG  Fri May  2 14:47:53 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E120714B;
 Fri,  2 May 2014 14:47:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 CF3251054;
 Fri,  2 May 2014 14:47:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s42ElrcA091268;
 Fri, 2 May 2014 14:47:53 GMT (envelope-from markm@svn.freebsd.org)
Received: (from markm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s42ElrXI091266;
 Fri, 2 May 2014 14:47:53 GMT (envelope-from markm@svn.freebsd.org)
Message-Id: <201405021447.s42ElrXI091266@svn.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Fri, 2 May 2014 14:47:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r265228 - projects/random_number_generator/sys/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 May 2014 14:47:53 -0000

Author: markm
Date: Fri May  2 14:47:53 2014
New Revision: 265228
URL: http://svnweb.freebsd.org/changeset/base/265228

Log:
  Don't let Yarrow and Foruna both appear in LINT* kernels; they are mutually exclusive.

Modified:
  projects/random_number_generator/sys/conf/NOTES

Modified: projects/random_number_generator/sys/conf/NOTES
==============================================================================
--- projects/random_number_generator/sys/conf/NOTES	Fri May  2 14:44:17 2014	(r265227)
+++ projects/random_number_generator/sys/conf/NOTES	Fri May  2 14:47:53 2014	(r265228)
@@ -2959,6 +2959,8 @@ options 	BROOKTREE_ALLOC_PAGES=(217*4+1)
 options 	MAXFILES=999
 
 # Random number generator
-options 	RANDOM_YARROW	# Yarrow RNG (Default)
-options 	RANDOM_FORTUNA	# Fortuna RNG
+# Only ONE of the below two may be used; they are mutually exclusive.
+options 	RANDOM_YARROW	# Yarrow CSPRNG (Default)
+#options 	RANDOM_FORTUNA	# Fortuna CSPRNG
+
 options 	RANDOM_DEBUG	# Debugging messages