From owner-svn-src-all@FreeBSD.ORG  Tue Jan 14 19:27:42 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 B00BEE48;
 Tue, 14 Jan 2014 19:27:42 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9AF4B16F0;
 Tue, 14 Jan 2014 19:27:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EJRgSq012586;
 Tue, 14 Jan 2014 19:27:42 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EJRgbD012585;
 Tue, 14 Jan 2014 19:27:42 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201401141927.s0EJRgbD012585@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 14 Jan 2014 19:27:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r260644 - in stable: 8/sys/dev/random 9/sys/dev/random
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 19:27:42 -0000

Author: delphij
Date: Tue Jan 14 19:27:42 2014
New Revision: 260644
URL: http://svnweb.freebsd.org/changeset/base/260644

Log:
  On stable/8 and stable/9, disable hardware random number generators
  by default.  This is a direct commit to stable/ branches because
  HEAD and stable/10 have superior implementation of random device.
  
  Approved by:	so

Modified:
  stable/9/sys/dev/random/probe.c

Changes in other areas also in this revision:
Modified:
  stable/8/sys/dev/random/probe.c

Modified: stable/9/sys/dev/random/probe.c
==============================================================================
--- stable/9/sys/dev/random/probe.c	Tue Jan 14 19:20:41 2014	(r260643)
+++ stable/9/sys/dev/random/probe.c	Tue Jan 14 19:27:42 2014	(r260644)
@@ -73,7 +73,7 @@ random_ident_hardware(struct random_syst
 	if (via_feature_rng & VIA_HAS_RNG) {
 		int enable;
 
-		enable = 1;
+		enable = 0;
 		TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable);
 		if (enable)
 			*systat = random_nehemiah;
@@ -83,7 +83,7 @@ random_ident_hardware(struct random_syst
 	if (cpu_feature2 & CPUID2_RDRAND) {
 		int enable;
 
-		enable = 1;
+		enable = 0;
 		TUNABLE_INT_FETCH("hw.ivy_rng_enable", &enable);
 		if (enable)
 			*systat = random_ivy;