Browse Source

Consistantly use /dev/arandom for feeding entropy to the kernel.

ok kjell otto miod
OPENBSD_4_9
deraadt 14 years ago
parent
commit
72958252d8
1 changed files with 5 additions and 7 deletions
  1. +5
    -7
      src/etc/rc

+ 5
- 7
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.345 2010/11/08 19:44:36 ajacoutot Exp $
# $OpenBSD: rc,v 1.346 2010/12/22 18:13:14 deraadt Exp $
# System startup script run by init on autoboot
# or after single-user.
@ -102,14 +102,12 @@ wsconsctl_conf()
random_seed()
{
if [ -f /var/db/host.random -a "X$random_seed_done" = "X" ]; then
dd if=/var/db/host.random of=/dev/urandom bs=1024 count=64 \
> /dev/null 2>&1
dd if=/var/db/host.random of=/dev/arandom bs=1024 count=64 \
> /dev/null 2>&1
# reset seed file, so that if a shutdown-less reboot occurs,
# the next seed is not a repeat
dd if=/dev/urandom of=/var/db/host.random bs=1024 count=64 \
dd if=/dev/arandom of=/var/db/host.random bs=1024 count=64 \
> /dev/null 2>&1
random_seed_done=1
@ -161,7 +159,7 @@ export PATH
. /etc/rc.conf
if [ X"$1" = X"shutdown" ]; then
dd if=/dev/urandom of=/var/db/host.random bs=1024 count=64 >/dev/null 2>&1
dd if=/dev/arandom of=/var/db/host.random bs=1024 count=64 >/dev/null 2>&1
chmod 600 /var/db/host.random >/dev/null 2>&1
if [ $? -eq 0 -a -f /etc/rc.shutdown ]; then
echo /etc/rc.shutdown in progress...
@ -310,9 +308,9 @@ fi
mount -s /usr >/dev/null 2>&1
mount -s /var >/dev/null 2>&1
# if there's no /var/db/host.random, make one through /dev/urandom
# if there's no /var/db/host.random, use /dev/arandom to create one
if [ ! -f /var/db/host.random ]; then
dd if=/dev/urandom of=/var/db/host.random bs=1024 count=64 \
dd if=/dev/arandom of=/var/db/host.random bs=1024 count=64 \
>/dev/null 2>&1
chmod 600 /var/db/host.random >/dev/null 2>&1
else


Loading…
Cancel
Save