diff options
Diffstat (limited to 'sys-apps/rng-tools/files')
| -rw-r--r-- | sys-apps/rng-tools/files/rngd-confd-4.1 | 10 | ||||
| -rw-r--r-- | sys-apps/rng-tools/files/rngd-initd-4.1 | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sys-apps/rng-tools/files/rngd-confd-4.1 b/sys-apps/rng-tools/files/rngd-confd-4.1 index c4303ba5448a..77e5db583458 100644 --- a/sys-apps/rng-tools/files/rngd-confd-4.1 +++ b/sys-apps/rng-tools/files/rngd-confd-4.1 @@ -18,13 +18,5 @@ STEP=64 # NO_DRNG=1 # Fill watermark -# 0 <= n <= 4096 +# 0 <= n <= `sysctl kernel.random.poolsize` WATERMARK=2048 - -# Bug #292239: Remixing /dev/urandom back into /dev/random is -# considered a security vulnerability in some cases where not enough -# entropy is present on systems. If you don't have a real random -# hardware generator, you're suggested to use a software designed for -# the particular task of creating new entropy, such as -# sys-apps/haveged. -DO_NOT_REMIX_URANDOM=1 diff --git a/sys-apps/rng-tools/files/rngd-initd-4.1 b/sys-apps/rng-tools/files/rngd-initd-4.1 index 54debbfbccf6..12ca56e595f9 100644 --- a/sys-apps/rng-tools/files/rngd-initd-4.1 +++ b/sys-apps/rng-tools/files/rngd-initd-4.1 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1,v 1.4 2012/12/17 11:19:35 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1,v 1.5 2012/12/17 12:19:19 flameeyes Exp $ depend() { need localmount @@ -11,7 +11,6 @@ depend() { # Do NOT add /dev/tpm to this. DEFAULT_DEVICE="/dev/hw_random* /dev/hwrandom* /dev/i810_rng /dev/hwrng*" -[ $DO_NOT_REMIX_URANDOM -eq 0 ] && DEFAULT_DEVICE="${DEFAULT_DEVICE} /dev/urandom" find_device() { local d |