d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys: Remove DEV_RANDOM device option

Browse Source 
Remove 'device random' from kernel configurations that reference it (most).
Replace perhaps mistaken 'nodevice random' in two MIPS configs with 'options
RANDOM_LOADABLE' instead.  Document removal in UPDATING; update NOTES and
random.4.

Reviewed by:	delphij, markm (previous version)
Approved by:	secteam(delphij)
Differential Revision:	https://reviews.freebsd.org/D19918
This commit is contained in:
Conrad Meyer 2019-06-21 00:16:30 +00:00
parent a809abd44a
commit c363b16c63
70 changed files with 20 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UPDATING
View File

@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
20190620:
The "device random" option has been removed. Entropy collection and
the /dev/random device are no longer an optional component.
Implementations of distilling algorithms can still be made loadable
with "options RANDOM_LOADABLE" (e.g., random_fortuna.ko).
20190612:
Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have
been upgraded to 8.0.1. Please see the 20141231 entry below for

1
release/picobsd/bridge/PICOBSD
View File

@ -50,7 +50,6 @@ device if_bridge
# qemu, so we set HZ explicitly.
options HZ=1000
device random # used by ssh
device pci
# Floppy drives

1
release/picobsd/qemu/PICOBSD
View File

@ -56,7 +56,6 @@ device if_bridge
# qemu, so we set HZ explicitly.
options HZ=1000
device random # used by ssh
device pci
# Floppy drives

1
share/man/man4/random.4
View File

@ -30,7 +30,6 @@
.Nm random
.Nd the entropy device
.Sh SYNOPSIS
.Cd "device random"
.Cd "options RANDOM_LOADABLE"
.Cd "options RANDOM_ENABLE_ETHER"
.Cd "options RANDOM_ENABLE_UMA"

1
sys/amd64/conf/GENERIC
View File

@ -309,7 +309,6 @@ device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device padlock_rng # VIA Padlock RNG
device rdrand_rng # Intel Bull Mountain RNG
device ether # Ethernet support

3
sys/amd64/conf/MINIMAL
View File

@ -10,7 +10,7 @@
# some features (ACL, GJOURNAL) that GENERIC includes.
# o acpi as a module has been reported flakey and not well tested, so
# is included in the kernel.
# o random is included due to uncertaty...
# o (non-loaded) random is included due to uncertainty...
# o Many networking things are included
#
# For now, please run changes to these list past imp@freebsd.org
@ -131,7 +131,6 @@ device agp # support several AGP chipsets
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device padlock_rng # VIA Padlock RNG
device rdrand_rng # Intel Bull Mountain RNG
device ether # Ethernet support

1
sys/arm/conf/ALPINE
View File

@ -41,7 +41,6 @@ device al_udma # Universal DMA
# Pseudo devices
device loop
device random
device pty
device md
device gpio

1
sys/arm/conf/ARMADA38X
View File

@ -25,7 +25,6 @@ options SMP
options VM_KMEM_SIZE_MAX=0x9CCD000
# Pseudo devices
device random
device pty
device loop
device md

1
sys/arm/conf/ARMADAXP
View File

@ -46,7 +46,6 @@ options NO_FFS_SNAPSHOT
options NO_SWAPPING
# Pseudo devices
device random
device pty
device loop
device md

1
sys/arm/conf/DB-78XXX
View File

@ -45,7 +45,6 @@ device pci
# Pseudo devices
device loop
device md
device random
# Serial ports
device uart

1
sys/arm/conf/DB-88F5XXX
View File

@ -44,7 +44,6 @@ device pci
# Pseudo devices
device md
device loop
device random
# Serial ports
device uart

1
sys/arm/conf/DB-88F6XXX
View File

@ -46,7 +46,6 @@ device pci
# Pseudo devices
device loop
device md
device random
# Serial ports
device uart

1
sys/arm/conf/DOCKSTAR
View File

@ -68,7 +68,6 @@ device gif # IPv6 and IPv4 tunneling
device loop # Network loopback
device md # Memory/malloc disk
device pty # BSD-style compatibility pseudo ttys
device random # Entropy device
device tuntap # Packet tunnel.
device ether # Required for all ethernet devices
device vlan # 802.1Q VLAN support

1
sys/arm/conf/DREAMPLUG-1001
View File

@ -71,7 +71,6 @@ device gif # IPv6 and IPv4 tunneling
device loop # Network loopback
device md # Memory/malloc disk
device pty # BSD-style compatibility pseudo ttys
device random # Entropy device
device tuntap # Packet tunnel.
device ether # Required for all ethernet devices
device vlan # 802.1Q VLAN support

1
sys/arm/conf/EFIKA_MX
View File

@ -57,7 +57,6 @@ device bpf # Berkeley packet filter
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
#device vlan # 802.1Q VLAN support
#device tuntap # Packet tunnel.

1
sys/arm/conf/GENERIC
View File

@ -121,7 +121,6 @@ device pl011
device pty
device snp
device md # Memory "disks"
device random # Entropy device
device firmware # firmware assist module
device pl310 # PL310 L2 cache controller
device psci

1
sys/arm/conf/IMX53
View File

@ -44,7 +44,6 @@ device bpf # Berkeley packet filter
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
#device vlan # 802.1Q VLAN support
#device tuntap # Packet tunnel.

1
sys/arm/conf/IMX6
View File

@ -49,7 +49,6 @@ device mpcore_timer
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device vlan # 802.1Q VLAN support
device tuntap # Packet tunnel.
device md # Memory "disks"

1
sys/arm/conf/RPI-B
View File

@ -65,7 +65,6 @@ device iicbus
device bcm2835_bsc
device md
device random # Entropy device
# USB support
device usb

1
sys/arm/conf/RT1310
View File

@ -51,7 +51,6 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
device loop
device md
device pty
device random
# Serial ports
device uart

1
sys/arm/conf/SHEEVAPLUG
View File

@ -46,7 +46,6 @@ options BOOTP_WIRED_TO=mge0
# Pseudo devices
device loop
device random
# Serial ports
device uart

1
sys/arm/conf/SOCFPGA
View File

@ -58,7 +58,6 @@ device dwmmc
# Pseudo devices
device loop
device random
device pty
device md
device gpio

1
sys/arm/conf/TEGRA124
View File

@ -43,7 +43,6 @@ device regulator
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device vlan # 802.1Q VLAN support
#device tuntap # Packet tunnel.
device md # Memory "disks"

1
sys/arm/conf/TS7800
View File

@ -45,7 +45,6 @@ device pci
# Pseudo devices
device md
device loop
device random
# Serial ports
device uart

1
sys/arm/conf/VERSATILEPB
View File

@ -66,7 +66,6 @@ options SC_DFLT_FONT # compile font in
makeoptions SC_DFLT_FONT=cp437
device md
device random # Entropy device
options PLATFORM

1
sys/arm/conf/VYBRID
View File

@ -59,7 +59,6 @@ device sdhci # generic sdhci
# Pseudo devices
device loop
device random
device pty
device md
device gpio

1
sys/arm/conf/ZEDBOARD
View File

@ -48,7 +48,6 @@ device pl310 # PL310 L2 cache controller
device mpcore_timer
device loop
device random
device ether
device cgem # Zynq-7000 gig ethernet device
device mii

1
sys/arm64/conf/GENERIC
View File

@ -293,7 +293,6 @@ device aw_cir
# Pseudo devices.
device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tuntap # Packet tunnel.

3
sys/conf/NOTES
View File

@ -1170,9 +1170,6 @@ options NFS_DEBUG # Enable NFS Debugging
#
options EXT2FS
# Cryptographically secure random number generator; /dev/random
device random
# The system memory devices; /dev/mem, /dev/kmem
device mem

16
sys/conf/files
View File

@ -686,14 +686,14 @@ crypto/des/des_ecb.c optional crypto | ipsec | ipsec_support | netsmb
crypto/des/des_setkey.c optional crypto | ipsec | ipsec_support | netsmb
crypto/rc4/rc4.c optional netgraph_mppc_encryption | kgssapi
crypto/rijndael/rijndael-alg-fst.c optional crypto | ekcd | geom_bde | \
ipsec | ipsec_support | random !random_loadable | wlan_ccmp
crypto/rijndael/rijndael-api-fst.c optional ekcd | geom_bde | random !random_loadable
ipsec | ipsec_support | !random_loadable | wlan_ccmp
crypto/rijndael/rijndael-api-fst.c optional ekcd | geom_bde | !random_loadable
crypto/rijndael/rijndael-api.c optional crypto | ipsec | ipsec_support | \
wlan_ccmp
crypto/sha1.c optional carp | crypto | ether | ipsec | \
ipsec_support | netgraph_mppc_encryption | sctp
crypto/sha2/sha256c.c optional crypto | ekcd | geom_bde | ipsec | \
ipsec_support | random !random_loadable | sctp | zfs
ipsec_support | !random_loadable | sctp | zfs
crypto/sha2/sha512c.c optional crypto | geom_bde | ipsec | \
ipsec_support | zfs
crypto/skein/skein.c optional crypto | zfs
@ -2766,11 +2766,11 @@ rt2860.fw optional rt2860fw | ralfw \
compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "rt2860.fw"
dev/random/random_infra.c optional random
dev/random/random_harvestq.c optional random
dev/random/randomdev.c optional random !random_loadable
dev/random/fortuna.c optional random !random_loadable
dev/random/hash.c optional random !random_loadable
dev/random/random_infra.c standard
dev/random/random_harvestq.c standard
dev/random/randomdev.c optional !random_loadable
dev/random/fortuna.c optional !random_loadable
dev/random/hash.c optional !random_loadable
dev/rc/rc.c optional rc
dev/rccgpio/rccgpio.c optional rccgpio gpio
dev/re/if_re.c optional re

2
sys/conf/files.arm64
View File

@ -87,7 +87,7 @@ arm/broadcom/bcm2835/bcm2835_ft5406.c optional evdev bcm2835_ft5406 soc_brcm_bc
arm/broadcom/bcm2835/bcm2835_gpio.c optional gpio soc_brcm_bcm2837 fdt
arm/broadcom/bcm2835/bcm2835_intr.c optional soc_brcm_bcm2837 fdt
arm/broadcom/bcm2835/bcm2835_mbox.c optional soc_brcm_bcm2837 fdt
arm/broadcom/bcm2835/bcm2835_rng.c optional random !random_loadable soc_brcm_bcm2837 fdt
arm/broadcom/bcm2835/bcm2835_rng.c optional !random_loadable soc_brcm_bcm2837 fdt
arm/broadcom/bcm2835/bcm2835_sdhci.c optional sdhci soc_brcm_bcm2837 fdt
arm/broadcom/bcm2835/bcm2835_sdhost.c optional sdhci soc_brcm_bcm2837 fdt
arm/broadcom/bcm2835/bcm2835_spi.c optional bcm2835_spi soc_brcm_bcm2837 fdt

2
sys/conf/files.powerpc
View File

@ -62,7 +62,7 @@ dev/ofw/ofw_standard.c optional aim powerpc
dev/ofw/ofw_subr.c standard
dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac
dev/quicc/quicc_bfe_fdt.c optional quicc mpc85xx
dev/random/darn.c optional powerpc64 random !random_loadable
dev/random/darn.c optional powerpc64 !random_loadable
dev/scc/scc_bfe_macio.c optional scc powermac
dev/sdhci/fsl_sdhci.c optional mpc85xx sdhci
dev/sec/sec.c optional sec mpc85xx

1
sys/conf/options
View File

@ -734,7 +734,6 @@ DEV_PCI opt_pci.h
DEV_PF opt_pf.h
DEV_PFLOG opt_pf.h
DEV_PFSYNC opt_pf.h
DEV_RANDOM opt_global.h
DEV_SPLASH opt_splash.h
DEV_VLAN opt_vlan.h

1
sys/i386/conf/GENERIC
View File

@ -292,7 +292,6 @@ device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device padlock_rng # VIA Padlock RNG
device rdrand_rng # Intel Bull Mountain RNG
device ether # Ethernet support

3
sys/i386/conf/MINIMAL
View File

@ -10,7 +10,7 @@
# some features (ACL, GJOURNAL) that GENERIC includes.
# o acpi as a module has been reported flakey and not well tested, so
# is included in the kernel.
# o random is included due to uncertaty...
# o (non-loaded) random is included due to uncertainty...
# o Many networking things are included
#
# For now, please run changes to these list past imp@freebsd.org
@ -132,7 +132,6 @@ device agp # support several AGP chipsets
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device padlock_rng # VIA Padlock RNG
device rdrand_rng # Intel Bull Mountain RNG
device ether # Ethernet support

1
sys/mips/conf/BCM
View File

@ -82,7 +82,6 @@ device uart
#Base
device loop
device ether
device random
device md
#Performance

1
sys/mips/conf/DIR-825B1
View File

@ -21,7 +21,6 @@ hints "DIR-825B1.hints"
# Since the kernel image must fit inside 1024KiB, we have to build almost
# everything as modules.
# nodevice random
nodevice gpio
nodevice gpioled
nodevice gif

1
sys/mips/conf/ERL
View File

@ -149,7 +149,6 @@ device wlan_amrr # AMRR transmit rate control algorithm
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tuntap # Packet tunnel.

1
sys/mips/conf/JZ4780
View File

@ -68,7 +68,6 @@ device miibus
device bpf
device md
device uart
device random
device fdt_pinctrl

1
sys/mips/conf/OCTEON1
View File

@ -184,7 +184,6 @@ device ral # Ralink Technology RT2500 wireless NICs.
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tuntap # Packet tunnel.

1
sys/mips/conf/PB92
View File

@ -133,5 +133,4 @@ device loop
device ether
#device md
#device bpf
device random
#device if_bridge

3
sys/mips/conf/PICOSTATION_M2HP
View File

@ -68,6 +68,3 @@ device arswitch
# Enable GPIO
device gpio
device gpioled
# RNG
device random

2
sys/mips/conf/WZR-300HP
View File

@ -49,4 +49,4 @@ device hwpmc
# load these via modules, shrink kernel
nodevice if_bridge
nodevice bridgestp
nodevice random
options RANDOM_LOADABLE

2
sys/mips/conf/WZR-HPAG300H
View File

@ -49,4 +49,4 @@ device hwpmc
# load these via modules, shrink kernel
nodevice if_bridge
nodevice bridgestp
nodevice random
options RANDOM_LOADABLE

1
sys/mips/conf/X1000
View File

@ -63,7 +63,6 @@ device miibus
device bpf
device md
device uart
device random
device fdt_pinctrl

1
sys/mips/conf/std.AR5312
View File

@ -72,7 +72,6 @@ device loop
device ether
device md
device bpf
device random
options ARGE_DEBUG # Enable if_arge debugging for now

1
sys/mips/conf/std.AR5315
View File

@ -72,7 +72,6 @@ device loop
device ether
device md
device bpf
device random
options ARGE_DEBUG # Enable if_arge debugging for now

3
sys/mips/conf/std.AR_MIPS_BASE
View File

@ -25,9 +25,6 @@ makeoptions MODULES_OVERRIDE+="gpio ar71xx if_gif if_vlan if_gre if_tuntap"
makeoptions MODULES_OVERRIDE+="if_bridge bridgestp usb"
makeoptions MODULES_OVERRIDE+="alq"
# Random - required during early boot!
device random
# net80211
options IEEE80211_DEBUG
options IEEE80211_SUPPORT_MESH

1
sys/mips/conf/std.BERI
View File

@ -61,5 +61,4 @@ device ether
device geom_map
device loop
device md
device random
device snp

1
sys/mips/conf/std.MALTA
View File

@ -55,4 +55,3 @@ device miibus
device bpf
device md
device uart
device random

1
sys/mips/conf/std.XLP
View File

@ -66,7 +66,6 @@ makeoptions FDT_DTS_FILE=xlp-basic.dts
# Pseudo
device loop
device random
device md
device bpf

3
sys/mips/mediatek/std.mediatek
View File

@ -74,9 +74,6 @@ device fdt_pinctrl
# UART support
device uart
# random support
device random
# loop device support
device loop

3
sys/mips/mediatek/std.rt2880
View File

@ -73,9 +73,6 @@ device fdt_pinctrl
# UART support
device uart
# random support
device random
# loop device support
device loop

1
sys/powerpc/conf/GENERIC
View File

@ -162,7 +162,6 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558)
# Pseudo devices.
device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tuntap # Packet tunnel.

1
sys/powerpc/conf/GENERIC64
View File

@ -183,7 +183,6 @@ device rl # RealTek 8129/8139
# Pseudo devices.
device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tuntap # Packet tunnel.

1
sys/powerpc/conf/MPC85XX
View File

@ -93,7 +93,6 @@ device mmcsd
device pass
device pci
device quicc
device random
#device rl
device scbus
device scc

1
sys/powerpc/conf/MPC85XXSPE
View File

@ -94,7 +94,6 @@ device mmcsd
device pass
device pci
device quicc
device random
#device rl
device scbus
device scc

1
sys/powerpc/conf/QORIQ64
View File

@ -99,7 +99,6 @@ device mmc
device mmcsd
device pass
device pci
device random
#device rl
device scbus
device scc

1
sys/powerpc/conf/dpaa/DPAA
View File

@ -96,7 +96,6 @@ device pci
# Pseudo devices
device ether # Ethernet support
device loop # Network loopback
device random # Entropy device
device bpf # Berkeley packet filter
device md # Memory "disks"

1
sys/riscv/conf/GENERIC
View File

@ -137,7 +137,6 @@ options ZSTDIO # zstd-compressed kernel and user dumps
# Pseudo devices.
device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tuntap # Packet tunnel.

1
sys/sparc64/conf/GENERIC
View File

@ -224,7 +224,6 @@ device ath_rate_sample # SampleRate tx rate control for ath
# Pseudo devices.
device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tuntap # Packet tunnel.

25
sys/sys/random.h
View File

@ -37,26 +37,9 @@
struct uio;
#if defined(DEV_RANDOM)
void read_random(void *, u_int);
int read_random_uio(struct uio *, bool);
bool is_random_seeded(void);
#else
static __inline int
read_random_uio(void *a __unused, u_int b __unused)
{
return (0);
}
static __inline void
read_random(void *a __unused, u_int b __unused)
{
}
static __inline bool
is_random_seeded(void)
{
return (false);
}
#endif
/*
* Note: if you add or remove members of random_entropy_source, remember to
@ -101,7 +84,6 @@ _Static_assert(ENTROPYSOURCE <= 32,
#define RANDOM_LEGACY_BOOT_ENTROPY_MODULE "/boot/entropy"
#define RANDOM_CACHED_BOOT_ENTROPY_MODULE "boot_entropy_cache"
#if defined(DEV_RANDOM)
extern u_int hc_source_mask;
void random_harvest_queue_(const void *, u_int, enum random_entropy_source);
void random_harvest_fast_(const void *, u_int);
@ -133,13 +115,6 @@ random_harvest_direct(const void *entropy, u_int size, enum random_entropy_sourc
void random_harvest_register_source(enum random_entropy_source);
void random_harvest_deregister_source(enum random_entropy_source);
#else
#define random_harvest_queue(a, b, c) do {} while (0)
#define random_harvest_fast(a, b, c) do {} while (0)
#define random_harvest_direct(a, b, c) do {} while (0)
#define random_harvest_register_source(a) do {} while (0)
#define random_harvest_deregister_source(a) do {} while (0)
#endif
#if defined(RANDOM_ENABLE_UMA)
#define random_harvest_fast_uma(a, b, c) random_harvest_fast(a, b, c)

1
tools/tools/nanobsd/pcengines/ALIX_DSK
View File

@ -65,7 +65,6 @@ device ath_hal
device ath_rate_sample
device wi
device loop
device random
device ether
device tun
device pty

1
tools/tools/tinybsd/conf/bridge/TINYBSD
View File

@ -130,7 +130,6 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"

1
tools/tools/tinybsd/conf/default/TINYBSD
View File

@ -140,7 +140,6 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device ppp # Kernel PPP
device tun # Packet tunnel.

1
tools/tools/tinybsd/conf/firewall/TINYBSD
View File

@ -129,7 +129,6 @@ device wlan # 802.11 support
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"

1
tools/tools/tinybsd/conf/minimal/TINYBSD
View File

@ -65,7 +65,6 @@ device pmtimer
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"

1
tools/tools/tinybsd/conf/vpn/TINYBSD
View File

@ -130,7 +130,6 @@ device xe # Xircom pccard Ethernet
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device ppp # Kernel PPP
device tun # Packet tunnel.

1
tools/tools/tinybsd/conf/wireless/TINYBSD
View File

@ -136,7 +136,6 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"

1
tools/tools/tinybsd/conf/wrap/TINYBSD
View File

@ -102,7 +102,6 @@ device ath_rate_sample
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device ppp # Kernel PPP
device tun # Packet tunnel.