summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsthen <sthen@openbsd.org>2019-10-06 16:16:19 +0000
committersthen <sthen@openbsd.org>2019-10-06 16:16:19 +0000
commite0e8f599fc9f78ad752ce6827bdfbb5bf60da229 (patch)
tree8d3139cad2967e3617b03eea7659a5e6fbeb6466
parentFix net80211's accounting of discarded input control frames. (diff)
downloadwireguard-openbsd-e0e8f599fc9f78ad752ce6827bdfbb5bf60da229.tar.xz
wireguard-openbsd-e0e8f599fc9f78ad752ce6827bdfbb5bf60da229.zip
for now, only mix in sysctl hw.{uuid,serialno,sensors} to /dev/random.
as found the hard way by d.rauschenb@gmail on an old fujitsu siemens machine, reading all of hw (notable hw.setperf) can have unexpected side-effects. ok deraadt
-rw-r--r--etc/rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index 8e0bd21d26d..3f5c6e940b7 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.538 2019/10/02 17:15:40 sthen Exp $
+# $OpenBSD: rc,v 1.539 2019/10/06 16:16:19 sthen Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@@ -445,7 +445,7 @@ sh /etc/netstart
# Any write triggers a rekey.
dmesg >/dev/random
-sysctl hw >/dev/random
+sysctl hw.{uuid,serialno,sensors} >/dev/random 2>&1
# Load pf rules and bring up pfsync interface.
if [[ $pf != NO ]]; then