Page MenuHomeFreeBSD
Files F144895196

D53390.1776863352.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D53390.1776863352.diff
View Options

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -389,3 +389,7 @@
# EFI devices
device efidev # EFI pseudo-device
device efirtc # EFI RTC
+
+# random(4)
+options RANDOM_ENABLE_KBD
+options RANDOM_ENABLE_MOUSE
diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev
--- a/sys/arm64/conf/std.dev
+++ b/sys/arm64/conf/std.dev
@@ -122,3 +122,7 @@
# Wireless options
options IEEE80211_DEBUG # enable debug msgs
options IEEE80211_SUPPORT_MESH # enable 802.11s draft support
+
+# random(4)
+options RANDOM_ENABLE_KBD
+options RANDOM_ENABLE_MOUSE
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2829,6 +2829,10 @@
# environment.
options RANDOM_ENABLE_ETHER # ether_input
+# On by default
+options RANDOM_ENABLE_KBD
+options RANDOM_ENABLE_MOUSE
+
# Module to enable execution of application via emulators like QEMU
options IMGACT_BINMISC
diff --git a/sys/conf/options b/sys/conf/options
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -960,6 +960,8 @@
# the uma slab allocator.
RANDOM_ENABLE_UMA opt_global.h
RANDOM_ENABLE_ETHER opt_global.h
+RANDOM_ENABLE_KBD opt_global.h
+RANDOM_ENABLE_MOUSE opt_global.h
# This options turns TPM into entropy source.
TPM_HARVEST opt_tpm.h
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -31,6 +31,8 @@
* SUCH DAMAGE.
*/
+#include "opt_global.h"
+
#include <sys/param.h>
#include <sys/consio.h>
#include <sys/devctl.h>
@@ -876,7 +878,9 @@
{
struct vt_window *vw = vd->vd_curwindow;
+#ifdef RANDOM_ENABLE_KBD
random_harvest_queue(&c, sizeof(c), RANDOM_KEYBOARD);
+#endif
#if VT_ALT_TO_ESC_HACK
if (c & RELKEY) {
switch (c & ~RELKEY) {
diff --git a/sys/dev/vt/vt_sysmouse.c b/sys/dev/vt/vt_sysmouse.c
--- a/sys/dev/vt/vt_sysmouse.c
+++ b/sys/dev/vt/vt_sysmouse.c
@@ -32,8 +32,8 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_evdev.h"
+#include "opt_global.h"
#include <sys/param.h>
#include <sys/condvar.h>
@@ -222,7 +222,9 @@
unsigned char buf[MOUSE_SYS_PACKETSIZE];
int x, y, iy, z;
+#ifdef RANDOM_ENABLE_MOUSE
random_harvest_queue(mi, sizeof *mi, RANDOM_MOUSE);
+#endif
mtx_lock(&sysmouse_lock);
switch (mi->operation) {
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -204,6 +204,10 @@
device iicbus # Bus support, required for iicoc below.
device iicoc # OpenCores I2C controller support
+# random(4)
+options RANDOM_ENABLE_KBD
+options RANDOM_ENABLE_MOUSE
+
# Include SoC specific configuration
include "std.allwinner"
include "std.cvitek"

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 1:09 PM (1 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28407926
Default Alt Text
D53390.1776863352.diff (2 KB)

Event Timeline