diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-12-17 12:19:19 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-12-17 12:19:19 +0000 |
| commit | c6343c366215542801ad96e9240c61b6c833c2fa (patch) | |
| tree | 951ab605cad3d809896af6e3e5356f557bd31073 /sys-apps/rng-tools | |
| parent | Version bump. (diff) | |
| download | gentoo-2-c6343c366215542801ad96e9240c61b6c833c2fa.tar.gz gentoo-2-c6343c366215542801ad96e9240c61b6c833c2fa.tar.bz2 gentoo-2-c6343c366215542801ad96e9240c61b6c833c2fa.zip | |
Remove direct uses of /dev/urandom — if the user wants to, they can do it explicitly; also update the upper limit for the watermark in the comment so that users know to check the poolsize (hardened can be much bigger than 4k). No revision bump since it's non-default behaviour anyway.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'sys-apps/rng-tools')
| -rw-r--r-- | sys-apps/rng-tools/ChangeLog | 9 | ||||
| -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 |
3 files changed, 10 insertions, 12 deletions
diff --git a/sys-apps/rng-tools/ChangeLog b/sys-apps/rng-tools/ChangeLog index e742ef3615a9..282c4078908d 100644 --- a/sys-apps/rng-tools/ChangeLog +++ b/sys-apps/rng-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/rng-tools # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.38 2012/12/17 11:19:35 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.39 2012/12/17 12:19:19 flameeyes Exp $ + + 17 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> files/rngd-confd-4.1, + files/rngd-initd-4.1: + Remove direct uses of /dev/urandom — if the user wants to, they can do it + explicitly; also update the upper limit for the watermark in the comment so + that users know to check the poolsize (hardened can be much bigger than 4k). + No revision bump since it's non-default behaviour anyway. *rng-tools-4-r5 (17 Dec 2012) 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 |