diff options
| author | markm <markm@FreeBSD.org> | 2000-06-25 09:55:12 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-06-25 09:55:12 +0000 |
| commit | 0417c878cd67620aeee73e3a0eb8a30db01aa21f (patch) | |
| tree | ff331e4ac3bb8ab2145a1cb92fc4946fe0c740c5 | |
| parent | 6100a3712446729e3b3752fa84daea413622c190 (diff) | |
| download | FreeBSD-src-0417c878cd67620aeee73e3a0eb8a30db01aa21f.zip FreeBSD-src-0417c878cd67620aeee73e3a0eb8a30db01aa21f.tar.gz | |
Remove old entropy-harvesting hooks; this is going to be re-engineered
later.
| -rw-r--r-- | sys/dev/syscons/syscons.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_hdr.h | 1 | ||||
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_kbd.c | 4 | ||||
| -rw-r--r-- | sys/pc98/pc98/syscons.c | 7 |
4 files changed, 0 insertions, 19 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 0d60d32..aea3c7e 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -47,7 +47,6 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/cons.h> -#include <sys/random.h> #include <machine/clock.h> #include <machine/console.h> @@ -2956,12 +2955,6 @@ next_code: if (!(c & RELKEY)) sc_touch_scrn_saver(); -#ifdef __i386__ - if (!(flags & SCGETC_CN)) - /* do the /dev/random device a favour */ - add_keyboard_randomness(c); -#endif - if (scp->kbd_mode != K_XLATE) return KEYCHAR(c); diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index 2078f5f..e58520a 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -59,7 +59,6 @@ #include <sys/uio.h> #include <sys/callout.h> #include <sys/kernel.h> -#include <sys/random.h> #include <sys/syslog.h> #include <sys/malloc.h> #include <sys/time.h> diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c index f74285f..85296a1 100644 --- a/sys/i386/isa/pcvt/pcvt_kbd.c +++ b/sys/i386/isa/pcvt/pcvt_kbd.c @@ -751,8 +751,6 @@ loop: { keybuf[0] = dt; - add_keyboard_randomness(dt); - return ((u_char *)keybuf); } @@ -827,8 +825,6 @@ loop: /* got a normal scan key */ regular: - add_keyboard_randomness(dt); - #if PCVT_SCANSET == 1 kbd_status.breakseen = dt & 0x80 ? 1 : 0; dt &= 0x7f; diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c index ce7ccd9..30de92d 100644 --- a/sys/pc98/pc98/syscons.c +++ b/sys/pc98/pc98/syscons.c @@ -47,7 +47,6 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/cons.h> -#include <sys/random.h> #include <machine/clock.h> #include <machine/console.h> @@ -2975,12 +2974,6 @@ next_code: if (!(c & RELKEY)) sc_touch_scrn_saver(); -#ifdef __i386__ - if (!(flags & SCGETC_CN)) - /* do the /dev/random device a favour */ - add_keyboard_randomness(c); -#endif - if (scp->kbd_mode != K_XLATE) return KEYCHAR(c); |
