svn commit: r260644 - in stable: 8/sys/dev/random 9/sys/dev/random

[Xin LI]

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;