[Midnightbsd-cvs] src: dev/random: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Dec 1 22:09:53 EST 2008
Log Message:
-----------
sync with freebsd
Modified Files:
--------------
src/sys/dev/random:
nehemiah.c (r1.1.1.2 -> r1.2)
probe.c (r1.3 -> r1.4)
randomdev.c (r1.1.1.2 -> r1.2)
randomdev.h (r1.1.1.2 -> r1.2)
randomdev_soft.c (r1.3 -> r1.4)
randomdev_soft.h (r1.1.1.2 -> r1.2)
yarrow.c (r1.4 -> r1.5)
-------------- next part --------------
Index: randomdev.c
===================================================================
RCS file: /home/cvs/src/sys/dev/random/randomdev.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sys/dev/random/randomdev.c -L sys/dev/random/randomdev.c -u -r1.1.1.2 -r1.2
--- sys/dev/random/randomdev.c
+++ sys/dev/random/randomdev.c
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/random/randomdev.c,v 1.59.2.1 2006/02/08 05:58:17 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/random/randomdev.c,v 1.61 2006/11/06 13:41:55 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,6 +41,7 @@
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/poll.h>
+#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/selinfo.h>
#include <sys/uio.h>
@@ -85,7 +86,7 @@
random_close(struct cdev *dev __unused, int flags, int fmt __unused,
struct thread *td)
{
- if ((flags & FWRITE) && (suser(td) == 0)
+ if ((flags & FWRITE) && (priv_check(td, PRIV_RANDOM_RESEED) == 0)
&& (securelevel_gt(td->td_ucred, 0) == 0)) {
(*random_systat.reseed)();
random_systat.seeded = 1;
Index: randomdev_soft.c
===================================================================
RCS file: /home/cvs/src/sys/dev/random/randomdev_soft.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sys/dev/random/randomdev_soft.c -L sys/dev/random/randomdev_soft.c -u -r1.3 -r1.4
--- sys/dev/random/randomdev_soft.c
+++ sys/dev/random/randomdev_soft.c
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/randomdev_soft.c,v 1.15 2007/05/28 18:20:15 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,54 +119,48 @@
{
int error, i;
struct harvest *np;
- struct sysctl_oid *o, *random_o, *random_sys_o, *random_sys_harvest_o;
+ struct sysctl_oid *random_o, *random_sys_o, *random_sys_harvest_o;
enum esource e;
- o = SYSCTL_ADD_NODE(&random_clist,
+ random_o = SYSCTL_ADD_NODE(&random_clist,
SYSCTL_STATIC_CHILDREN(_kern),
OID_AUTO, "random", CTLFLAG_RW, 0,
"Software Random Number Generator");
- random_o = o;
-
random_yarrow_init_alg(&random_clist, random_o);
- o = SYSCTL_ADD_NODE(&random_clist,
+ random_sys_o = SYSCTL_ADD_NODE(&random_clist,
SYSCTL_CHILDREN(random_o),
OID_AUTO, "sys", CTLFLAG_RW, 0,
"Entropy Device Parameters");
- random_sys_o = o;
-
- o = SYSCTL_ADD_PROC(&random_clist,
+ SYSCTL_ADD_PROC(&random_clist,
SYSCTL_CHILDREN(random_sys_o),
OID_AUTO, "seeded", CTLTYPE_INT | CTLFLAG_RW,
&random_systat.seeded, 1, random_check_boolean, "I",
"Seeded State");
- o = SYSCTL_ADD_NODE(&random_clist,
+ random_sys_harvest_o = SYSCTL_ADD_NODE(&random_clist,
SYSCTL_CHILDREN(random_sys_o),
OID_AUTO, "harvest", CTLFLAG_RW, 0,
"Entropy Sources");
- random_sys_harvest_o = o;
-
- o = SYSCTL_ADD_PROC(&random_clist,
+ SYSCTL_ADD_PROC(&random_clist,
SYSCTL_CHILDREN(random_sys_harvest_o),
OID_AUTO, "ethernet", CTLTYPE_INT | CTLFLAG_RW,
&harvest.ethernet, 1, random_check_boolean, "I",
"Harvest NIC entropy");
- o = SYSCTL_ADD_PROC(&random_clist,
+ SYSCTL_ADD_PROC(&random_clist,
SYSCTL_CHILDREN(random_sys_harvest_o),
OID_AUTO, "point_to_point", CTLTYPE_INT | CTLFLAG_RW,
&harvest.point_to_point, 1, random_check_boolean, "I",
"Harvest serial net entropy");
- o = SYSCTL_ADD_PROC(&random_clist,
+ SYSCTL_ADD_PROC(&random_clist,
SYSCTL_CHILDREN(random_sys_harvest_o),
OID_AUTO, "interrupt", CTLTYPE_INT | CTLFLAG_RW,
&harvest.interrupt, 1, random_check_boolean, "I",
"Harvest IRQ entropy");
- o = SYSCTL_ADD_PROC(&random_clist,
+ SYSCTL_ADD_PROC(&random_clist,
SYSCTL_CHILDREN(random_sys_harvest_o),
OID_AUTO, "swi", CTLTYPE_INT | CTLFLAG_RW,
&harvest.swi, 0, random_check_boolean, "I",
@@ -284,7 +278,7 @@
/* Found nothing, so don't belabour the issue */
if (!active)
- tsleep(&harvestfifo, 0, "-", hz / 10);
+ pause("-", hz / 10);
}
Index: randomdev.h
===================================================================
RCS file: /home/cvs/src/sys/dev/random/randomdev.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sys/dev/random/randomdev.h -L sys/dev/random/randomdev.h -u -r1.1.1.2 -r1.2
--- sys/dev/random/randomdev.h
+++ sys/dev/random/randomdev.h
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/random/randomdev.h,v 1.6.8.1 2006/02/08 05:58:17 ps Exp $
+ * $FreeBSD: src/sys/dev/random/randomdev.h,v 1.7 2005/12/20 21:41:52 ps Exp $
*/
/* This header contains only those definitions that are global
Index: yarrow.c
===================================================================
RCS file: /home/cvs/src/sys/dev/random/yarrow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -L sys/dev/random/yarrow.c -L sys/dev/random/yarrow.c -u -r1.4 -r1.5
--- sys/dev/random/yarrow.c
+++ sys/dev/random/yarrow.c
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/random/yarrow.c,v 1.45.2.1 2006/02/08 05:58:17 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/random/yarrow.c,v 1.47.2.1 2007/11/29 16:05:38 simon Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -114,7 +114,7 @@
OID_AUTO, "yarrow", CTLFLAG_RW, 0,
"Yarrow Parameters");
- SYSCTL_ADD_PROC(clist,
+ SYSCTL_ADD_PROC(clist,
SYSCTL_CHILDREN(random_yarrow_o), OID_AUTO,
"gengateinterval", CTLTYPE_INT|CTLFLAG_RW,
&random_state.gengateinterval, 10,
Index: nehemiah.c
===================================================================
RCS file: /home/cvs/src/sys/dev/random/nehemiah.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sys/dev/random/nehemiah.c -L sys/dev/random/nehemiah.c -u -r1.1.1.2 -r1.2
--- sys/dev/random/nehemiah.c
+++ sys/dev/random/nehemiah.c
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/random/nehemiah.c,v 1.3.2.1 2006/02/08 05:58:17 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/random/nehemiah.c,v 1.4 2005/12/20 21:41:52 ps Exp $");
#include <sys/param.h>
#include <sys/time.h>
Index: probe.c
===================================================================
RCS file: /home/cvs/src/sys/dev/random/probe.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sys/dev/random/probe.c -L sys/dev/random/probe.c -u -r1.3 -r1.4
--- sys/dev/random/probe.c
+++ sys/dev/random/probe.c
@@ -24,11 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
- /*
- * $FreeBSD: src/sys/dev/random/probe.c,v 1.4 2005/05/30 05:01:44 scottl Exp $
- */
+
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/probe.c,v 1.7 2006/07/13 11:47:36 mr Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -41,6 +39,8 @@
#if defined(__i386__) && !defined(PC98)
#include <machine/cpufunc.h>
#include <machine/cputypes.h>
+#include <machine/md_var.h>
+#include <machine/specialreg.h>
#endif
#include <dev/random/randomdev.h>
@@ -50,25 +50,14 @@
void
random_ident_hardware(struct random_systat *systat)
{
-#if defined(__i386__) && !defined(PC98)
- u_int regs[4];
-#endif
/* Set default to software */
*systat = random_yarrow;
/* Then go looking for hardware */
#if defined(__i386__) && !defined(PC98)
- if (cpu_class < CPUCLASS_586)
- return;
- do_cpuid(1, regs);
- if ((regs[0] & 0xf) >= 3) {
- do_cpuid(0xc0000000, regs);
- if (regs[0] == 0xc0000001) {
- do_cpuid(0xc0000001, regs);
- if ((regs[3] & 0x0c) == 0x0c)
- *systat = random_nehemiah;
- }
+ if (via_feature_rng & VIA_HAS_RNG) {
+ *systat = random_nehemiah;
}
#endif
}
Index: randomdev_soft.h
===================================================================
RCS file: /home/cvs/src/sys/dev/random/randomdev_soft.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sys/dev/random/randomdev_soft.h -L sys/dev/random/randomdev_soft.h -u -r1.1.1.2 -r1.2
--- sys/dev/random/randomdev_soft.h
+++ sys/dev/random/randomdev_soft.h
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/random/randomdev_soft.h,v 1.2 2005/12/20 21:41:52 ps Exp $
*/
/* This header contains only those definitions that are global
More information about the Midnightbsd-cvs
mailing list