Commit b9b01a56 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld
Browse files

random: use random.trust_{bootloader,cpu} command line option only 



It's very unusual to have both a command line option and a compile time
option, and apparently that's confusing to people. Also, basically
everybody enables the compile time option now, which means people who
want to disable this wind up having to use the command line option to
ensure that anyway. So just reduce the number of moving pieces and nix
the compile time option in favor of the more versatile command line
option.

Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
parent 622754e8

Documentation/admin-guide/kernel-parameters.txt

+9 −11
Original line number Diff line number Diff line
@@ -4566,17 +4566,15 @@ 


	ramdisk_start=	[RAM] RAM disk image start address



	random.trust_cpu={on,off}

			[KNL] Enable or disable trusting the use of the

			CPU's random number generator (if available) to

			fully seed the kernel's CRNG. Default is controlled

			by CONFIG_RANDOM_TRUST_CPU.



	random.trust_bootloader={on,off}

			[KNL] Enable or disable trusting the use of a

			seed passed by the bootloader (if available) to

			fully seed the kernel's CRNG. Default is controlled

			by CONFIG_RANDOM_TRUST_BOOTLOADER.

	random.trust_cpu=off

			[KNL] Disable trusting the use of the CPU's

			random number generator (if available) to

			initialize the kernel's RNG.



	random.trust_bootloader=off

			[KNL] Disable trusting the use of the a seed

			passed by the bootloader (if available) to

			initialize the kernel's RNG.



	randomize_kstack_offset=

			[KNL] Enable or disable kernel stack offset

arch/powerpc/configs/microwatt_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ CONFIG_SERIAL_8250_CONSOLE=y 
CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_NONSTANDARD=y

# CONFIG_NVRAM is not set

CONFIG_RANDOM_TRUST_CPU=y

CONFIG_SPI=y

CONFIG_SPI_DEBUG=y

CONFIG_SPI_BITBANG=y

arch/s390/configs/debug_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -573,8 +573,6 @@ CONFIG_VIRTIO_CONSOLE=m 
CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_HANGCHECK_TIMER=m

CONFIG_TN3270_FS=y

# CONFIG_RANDOM_TRUST_CPU is not set

# CONFIG_RANDOM_TRUST_BOOTLOADER is not set

CONFIG_PPS=m

# CONFIG_PTP_1588_CLOCK is not set

# CONFIG_HWMON is not set

arch/s390/configs/defconfig

+0 −2
Original line number Diff line number Diff line
@@ -563,8 +563,6 @@ CONFIG_VIRTIO_CONSOLE=m 
CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_HANGCHECK_TIMER=m

CONFIG_TN3270_FS=y

# CONFIG_RANDOM_TRUST_CPU is not set

# CONFIG_RANDOM_TRUST_BOOTLOADER is not set

# CONFIG_PTP_1588_CLOCK is not set

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

arch/s390/configs/zfcpdump_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ CONFIG_ZFCP=y 
# CONFIG_VMCP is not set

# CONFIG_MONWRITER is not set

# CONFIG_S390_VMUR is not set

# CONFIG_RANDOM_TRUST_BOOTLOADER is not set

# CONFIG_HID is not set

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set