supply entropy from mouse; provos@ ok

3 files changed, 9 insertions, 3 deletions

diff --git a/sys/arch/i386/isa/lms.c b/sys/arch/i386/isa/lms.c
index a9420dab1c9..2a3f7ab990a 100644
--- a/sys/arch/i386/isa/lms.c
+++ b/sys/arch/i386/isa/lms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lms.c,v 1.13 1999/11/22 07:25:38 matthieu Exp $	*/
+/*	$OpenBSD: lms.c,v 1.14 2000/05/16 18:12:14 mickey Exp $	*/
 /*	$NetBSD: lms.c,v 1.30 1996/10/21 22:27:41 thorpej Exp $	*/
 
 /*-
@@ -45,6 +45,7 @@
 #include <machine/conf.h>
 
 #include <dev/isa/isavar.h>
+#include <dev/rndvar.h>
 
 #define	LMS_DATA	0       /* offset for data port, read-only */
 #define	LMS_SIGN	1       /* offset for signature port, read-write */
@@ -369,6 +370,7 @@ lmsintr(arg)
 		buffer[2] = dy;
 		buffer[3] = buffer[4] = 0;
 		(void) b_to_q(buffer, sizeof buffer, &sc->sc_q);
+		add_mouse_randomness(*(u_int32_t*)buffer);
 
 		if (sc->sc_state & LMS_ASLP) {
 			sc->sc_state &= ~LMS_ASLP;
diff --git a/sys/arch/i386/isa/mms.c b/sys/arch/i386/isa/mms.c
index da173f02bf9..fff15ea2b85 100644
--- a/sys/arch/i386/isa/mms.c
+++ b/sys/arch/i386/isa/mms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mms.c,v 1.11 1999/11/22 07:26:04 matthieu Exp $	*/
+/*	$OpenBSD: mms.c,v 1.12 2000/05/16 18:12:14 mickey Exp $	*/
 /*	$NetBSD: mms.c,v 1.24 1996/05/12 23:12:18 mycroft Exp $	*/
 
 /*-
@@ -45,6 +45,7 @@
 #include <machine/conf.h>
 
 #include <dev/isa/isavar.h>
+#include <dev/rndvar.h>
 
 #define	MMS_ADDR	0	/* offset for register select */
 #define	MMS_DATA	1	/* offset for InPort data */
@@ -348,6 +349,7 @@ mmsintr(arg)
 		buffer[2] = dy;
 		buffer[3] = buffer[4] = 0;
 		(void) b_to_q(buffer, sizeof buffer, &sc->sc_q);
+		add_mouse_randomness(*(u_int32_t*)buffer);
 
 		if (sc->sc_state & MMS_ASLP) {
 			sc->sc_state &= ~MMS_ASLP;
diff --git a/sys/arch/i386/isa/pms.c b/sys/arch/i386/isa/pms.c
index 5edc1c08d13..bd709cbbcb0 100644
--- a/sys/arch/i386/isa/pms.c
+++ b/sys/arch/i386/isa/pms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pms.c,v 1.25 2000/01/15 17:40:20 deraadt Exp $	*/
+/*	$OpenBSD: pms.c,v 1.26 2000/05/16 18:12:14 mickey Exp $	*/
 /*	$NetBSD: pms.c,v 1.29 1996/05/12 23:12:42 mycroft Exp $	*/
 
 /*-
@@ -59,6 +59,7 @@
 #include <machine/conf.h>
 
 #include <dev/isa/isavar.h>
+#include <dev/rndvar.h>
 
 #define	PMS_DATA	0x60	/* offset for data port, read-write */
 #define	PMS_CNTRL	0x64	/* offset for control port, write-only */
@@ -544,6 +545,7 @@ pmsintr(arg)
 				buffer[2] = dy;
 				buffer[3] = buffer[4] = 0;
 				(void) b_to_q(buffer, sizeof buffer, &sc->sc_q);
+				add_mouse_randomness(*(u_int32_t*)buffer);
 
 				if (sc->sc_state & PMS_ASLP) {
 					sc->sc_state &= ~PMS_ASLP;