diff options
| -rw-r--r-- | sys-apps/rng-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/rng-tools/Manifest | 6 | ||||
| -rw-r--r-- | sys-apps/rng-tools/files/2-r2/rngd | 7 | ||||
| -rw-r--r-- | sys-apps/rng-tools/files/2-r2/rngd-conf | 5 |
4 files changed, 17 insertions, 7 deletions
diff --git a/sys-apps/rng-tools/ChangeLog b/sys-apps/rng-tools/ChangeLog index e7fd0cbc34a7..99b1c0eac18a 100644 --- a/sys-apps/rng-tools/ChangeLog +++ b/sys-apps/rng-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/rng-tools # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.28 2010/09/15 08:30:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.29 2010/09/15 08:36:14 robbat2 Exp $ + + 15 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> files/2-r2/rngd, + files/2-r2/rngd-conf: + Bug #292239: Make remix of /dev/urandom optional. *rng-tools-2-r3 (15 Sep 2010) diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index cb62f2956c60..c846c3b87611 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -1,5 +1,5 @@ -AUX 2-r2/rngd 1748 RMD160 50dc8789437105f9d8887b79a7e0b0f82fb47424 SHA1 006c03919802ec54eb10b9c1ce8b3d74d23a1aea SHA256 27921130fee5dbc252ab0ca00c2756cdaf1085bb1df753da6b4a60764438680d -AUX 2-r2/rngd-conf 526 RMD160 5539152fa9544775cb47cb18f4b0c0e1ce113a13 SHA1 ca364bc4d3b905c2892e15be5afec7da617ae5ff SHA256 311464e4f573379a81f449af43d8a7c0328ac2a84d8f6e541e015542dfb145ed +AUX 2-r2/rngd 1818 RMD160 6f36e0bc6f692eade9c472ba3542275a9cc3693d SHA1 75263283903c995c12409b0d40cb9a48730b8665 SHA256 a704ac930809561da739427e6b7f1e3019480b031b3c31866b4e772d1da0751a +AUX 2-r2/rngd-conf 714 RMD160 68a896a6ac5af055c4d8938b4e69e9e638c43eca SHA1 e7a4b3bab3c4fa4216d08d4e543a3cab31794c78 SHA256 542ef931152a71888b8d1ebb2c1f5d43edefcd2902d616d635e1d15a0e742519 AUX 2/rngd 1488 RMD160 eb3628986ba3896deb8dfaf6765c052cb2d673ae SHA1 ce333b36be8144f24d55397c06dbf0eea4f3563d SHA256 00f8d05292565feb750d20af4ff6ff8ee20a14ae09c0164ec7b6b4b1ee67028d AUX 2/rngd-conf 259 RMD160 278957b8acad462fd5c888344fb21a52dffd1c6b SHA1 a3fe13793fffe10577f94398946b20142eae0771 SHA256 4dff7a0c8406f5344f71d236e755877388e93ff6728eedfdfe6921b3de41d137 AUX rngd_tpm_support.patch 7620 RMD160 b346d1b27edcd7cb9ad302ec870c73029e7f5276 SHA1 415115d91e823b5a74ef396d5b0bf62b8770b34b SHA256 44839db3a5dbc6d7a27d9e66ace1a68459bc532cd36e891a996b4f9dcd59f555 @@ -8,5 +8,5 @@ DIST rng-tools-2.tar.gz 86429 RMD160 c40bc13068ffb48e28e1a8da274c0be40deb0a8a SH EBUILD rng-tools-2-r1.ebuild 780 RMD160 04c419c84306e79aab5a9220a3657a3bbe73641e SHA1 c8b1b7113993f9d3605e982d3cc2e7e369c886ac SHA256 c807a02a07216dfbe879742ae75cc33d3870d11f07cc8a9c5de43da0b8c98e21 EBUILD rng-tools-2-r2.ebuild 793 RMD160 8d27c06eafddadbebec93880eb4f54b1599f8511 SHA1 ff9708cc0fdbe66c7462e559448c4e2adde40ecc SHA256 d0a0f72cbec85b6eb11758732080cfc436fbfe2c2fbc8b41d58ec7241787ad8d EBUILD rng-tools-2-r3.ebuild 794 RMD160 567a0b2fac5e1eafb9c6210a197c80d4ab81fc1b SHA1 c11a60705a07d44c407cd5fe6a4bcf7e5ec1e0e8 SHA256 36c72f22f414eda503ab4f696ee3e1c6b3d2b56b7d2fcb623bf95d927c8b1a33 -MISC ChangeLog 3715 RMD160 cf9d05ac9a5af64e0c1e796ce639c66ad8a6e693 SHA1 f1c88c2aafe13ffb625647cb4f0444d4971cedbd SHA256 5e204baf0a28a63c8c3dfb9377ee3fcded2efb2ebde8bcbd148a5697da7cf53d +MISC ChangeLog 3862 RMD160 6ef88d90b917c7309756ebf6b40555c79c52fcb5 SHA1 9ae4bec96e81cd90e00f091be0e1322f3d3b10ae SHA256 8f428d7a07f5498252f990bb2a7b7568ae1a4ed15487027a5240ea03a2722193 MISC metadata.xml 231 RMD160 984878f0848eaa1ef84b38196bb704d218277437 SHA1 6015bdc80c95314a6250c06380f316ca4c753770 SHA256 c9a6ce79e19aa9257b980bda6f6b6332d0fcb81f50800bb12c1a1c6d2f5cd443 diff --git a/sys-apps/rng-tools/files/2-r2/rngd b/sys-apps/rng-tools/files/2-r2/rngd index 8d8cb2c07f3f..76ac703069bc 100644 --- a/sys-apps/rng-tools/files/2-r2/rngd +++ b/sys-apps/rng-tools/files/2-r2/rngd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/2-r2/rngd,v 1.1 2009/11/10 03:15:06 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/2-r2/rngd,v 1.2 2010/09/15 08:36:14 robbat2 Exp $ depend() { need localmount @@ -10,8 +10,9 @@ depend() { BINARY=/usr/sbin/rngd # Do NOT add /dev/tpm to this. -DEFAULT_DEVICE="/dev/hw_random* /dev/hwrandom* /dev/i810_rng /dev/hwrng* /dev/urandom" +DEFAULT_DEVICE="/dev/hw_random* /dev/hwrandom* /dev/i810_rng /dev/hwrng*" DEFAULT_TPM_DEVICE="/dev/tpm*" +[ $DO_NOT_REMIX_URANDOM -eq 0 ] && DEFAULT_DEVICE="${DEFAULT_DEVICE} /dev/urandom" find_device() { # The echo is to cause globbing diff --git a/sys-apps/rng-tools/files/2-r2/rngd-conf b/sys-apps/rng-tools/files/2-r2/rngd-conf index d6efc7466f5c..0702ece0ae14 100644 --- a/sys-apps/rng-tools/files/2-r2/rngd-conf +++ b/sys-apps/rng-tools/files/2-r2/rngd-conf @@ -20,3 +20,8 @@ NO_TPM=0 # Fill watermark # 0 <= n <= 4096 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. +DO_NOT_REMIX_URANDOM=0 |